Merge master

# Conflicts:
#	v2/internal/frontend/desktop/windows/win32/consts.go

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,41 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-#####################################################
-     **If you have a technical issue, please do not open a bug this way!** 
-                      Please use the `wails issue` command!
-          If you do not do this then the issue may be closed automatically.                      
-
- NOTE: If your bug is related to Windows, make sure you read 
- the [Windows Developer Guide](https://wails.app/guides/windows/)
-#####################################################
-
-**Description**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behaviour:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behaviour**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**System Details**
-Please provide your platform, GO version and variables, etc
-
-**Additional context**
-Add any other context about the problem here.
-
-- [ ] This issue is for Windows and I have read the [Windows Developer Guide](https://wails.app/guides/windows/)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,83 @@
+name: Bug Report
+description: Create a report to help us improve
+# title: ""
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ***Please note: No new bug reports are being accepted for Wails v1***
+        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. 
+        - Search the issue tracker using [this link](https://github.com/wailsapp/wails/issues?q=is%3Aissue+).
+        - Search the [discussion forums](https://github.com/wailsapp/wails/discussions?discussions_q=type+your+issue+here).
+        - Read the [Troubleshooting Guide](https://wails.io/docs/next/guides/troubleshooting).
+        - Try to fix it yourself. Keep a list of things you have done to fix the problem.   
+
+        If after doing all the above, the problem remains, please continue with this ticket providing *all* the information requested.
+
+        Bug reports that do not follow these steps will likely be closed, so please help us to help you.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+      placeholder: A clear and concise description of what the bug is.
+      # value: ""
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behaviour
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behaviour
+      description: A clear and concise description of what you expected to happen.
+      placeholder: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+      placeholder: If applicable, add screenshots to help explain your problem.
+    validations:
+      required: false
+  - type: textarea
+    id: attempted-fixes
+    attributes:
+      label: Attempted Fixes
+      description: A list of things you have tried to fix the problem, including search engine links.
+      placeholder: A list of things you have tried to fix the problem, including search engine links.
+    validations:
+      required: false
+  - type: textarea
+    id: systemetails
+    attributes:
+      label: System Details
+      description: Please add the output of `wails doctor`.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+      placeholder: Add any other context about the problem here.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: GitHub Community Discussions
+    url: https://github.com/wailsapp/wails/discussions
+    about: If your question is not a feature or a bug, please go to the discussion panel and retrieve if your question already exists before submitting.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,39 @@
+name: Feature request
+description: Suggest an idea for this project
+# title: ""
+labels: ["enhancement"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before opening a feature request, please check the [Roadmap](https://github.com/wailsapp/wails/discussions/1484) to see if it has already been requested.
+        ***Please note: No new feature requests are being accepted for Wails v1***
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false

.github/stale.yml

@@ -8,6 +8,7 @@ exemptLabels:
   - security
   - onhold
   - inprogress
+  - "Selected For Development"
 # Label to use when marking an issue as stale
 staleLabel: wontfix
 # Comment to post when marking an issue as stale. Set to `false` to disable
@@ -16,4 +17,6 @@ markComment: >
   recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false
+exemptMilestones: true
+exemptAssignees: true

.github/workflows/deploy-website-to-wails.top-mirror.yml

@@ -0,0 +1,50 @@
+name: Sync upstream branch and deploy mirror | 同步上游分支并部署镜像
+
+on:
+  schedule:
+    - cron: "0 8,20 * * *"
+  workflow_dispatch:
+
+jobs:
+  build-and-deploy:
+    name: Automatic deployment | 自动部署
+    runs-on: ubuntu-latest
+    if: github.repository == 'misitebao/wails'
+
+    steps:
+      - name: Checkout | 切换到部署分支
+        uses: actions/checkout@v2
+        with:
+          ref: "master"
+          submodules: true
+          fetch-depth: 0
+
+      - name: Setup Git | 设置Git
+        run: |
+          git config --local user.email "i@misitebao.com"
+          git config --local user.name "misitebao"
+
+      - name: Add remote upstream repository and sync | 添加远程上游仓库并同步
+        run: |
+          git remote add upstream https://github.com/wailsapp/wails
+          git pull -v --progress --no-rebase "upstream" master
+
+      - name: Push | 推送
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
+
+      - name: Build Site | 构建网站
+        run: |
+          cd website &&
+          npm install && npm run build
+
+      - name: Deploy to Server | 部署到服务器
+        uses: hengkx/ssh-deploy@v1.0.1
+        with:
+          HOST: ${{ secrets.DEPLOY_HOST }}
+          USERNAME: ${{ secrets.DEPLOY_HOST_USER }}
+          PASSWORD: ${{ secrets.DEPLOY_HOST_PASSWORD }}
+          SOURCE: "website/build"
+          TARGET: "/www/wwwroot/wails.top"

.gitignore

@@ -31,3 +31,5 @@ v2/test/kitchensink/frontend/package.json.md5
 !v2/internal/ffenestri/windows/x64/webview2.dll
 !v2/internal/ffenestri/windows/x64/WebView2Loader.dll
 .idea/
+v2/cmd/wails/internal/commands/initialise/templates/testtemplates/
+v2/internal/frontend/desktop/darwin/test.xcodeproj

README.md

@@ -1,220 +1,216 @@
 <p align="center" style="text-align: center">
-   <img src="logo_cropped.png" width="40%"><br/>
+  <img src="logo-universal.png" width="55%"><br/>
 </p>
 <p align="center">
-   Build desktop applications using Go & Web Technologies.<br/><br/>
-   <a href="https://github.com/wailsapp/wails/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg"></a>
-   <a href="https://goreportcard.com/report/github.com/wailsapp/wails"><img src="https://goreportcard.com/badge/github.com/wailsapp/wails"/></a>
-   <a href="http://godoc.org/github.com/wailsapp/wails"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"/></a>
-   <a href="https://www.codefactor.io/repository/github/wailsapp/wails"><img src="https://www.codefactor.io/repository/github/wailsapp/wails/badge" alt="CodeFactor" /></a>
-   <a href="https://github.com/wailsapp/wails/issues"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="CodeFactor" /></a>
-   <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=shield"/></a>
-   <a href="https://houndci.com"><img src="https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg"/></a>
-   <a href="https://github.com/avelino/awesome-go" rel="nofollow"><img src="https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg" alt="Awesome"></a>
-   <a href="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" rel="nofollow"><img src="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" alt="Release Pipelines"></a>
+  Build desktop applications using Go & Web Technologies.<br/><br/>
+  <a href="https://github.com/wailsapp/wails/blob/master/LICENSE">
+    <img src="https://img.shields.io/badge/License-MIT-blue.svg">
+  </a>
+  <a href="https://goreportcard.com/report/github.com/wailsapp/wails">
+    <img src="https://goreportcard.com/badge/github.com/wailsapp/wails"/>
+  </a>
+  <a href="http://godoc.org/github.com/wailsapp/wails">
+    <img src="https://img.shields.io/badge/godoc-reference-blue.svg"/>
+  </a>
+  <a href="https://www.codefactor.io/repository/github/wailsapp/wails">
+    <img src="https://www.codefactor.io/repository/github/wailsapp/wails/badge" alt="CodeFactor" />
+  </a>
+  <a href="https://github.com/wailsapp/wails/issues">
+    <img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="CodeFactor" />
+  </a>
+  <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_shield" alt="FOSSA Status">
+    <img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=shield"/>
+  </a>
+  <a href="https://houndci.com">
+    <img src="https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg"/>
+  </a>
+  <a href="https://github.com/avelino/awesome-go" rel="nofollow">
+    <img src="https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg" alt="Awesome"/>
+  </a>
+  <a href="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" rel="nofollow">
+    <img src="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" alt="Release Pipelines"/>
+  </a>
 </p>
 
 <span id="nav-1"></span>
 
 ## Internationalization
 
-English | [简体中文](README.zh-Hans.md)
+[English](README.md) | [简体中文](README.zh-Hans.md)
+
+<span id="nav-2"></span>
+
+## Table of Contents
+
+<details>
+  <summary>Click me to Open/Close the directory listing</summary>
+
+- [1. Internationalization](#nav-1)
+- [2. Table of Contents](#nav-2)
+- [3. Introduction](#nav-3)
+  - [3.1 Official Website](#nav-3-1)
+- [4. Features](#nav-4)
+- [5. Sponsors](#nav-5)
+- [6. Installation](#nav-6)
+- [7. FAQ](#nav-8)
+- [8. Contributors](#nav-9)
+- [9. Special Mentions](#nav-10)
+- [10. Special Thanks](#nav-11)
+
+</details>
+
+<span id="nav-3"></span>
+
+## Introduction
 
 The traditional method of providing web interfaces to Go programs is via a built-in web server. Wails offers a different
 approach: it provides the ability to wrap both Go code and a web frontend into a single binary. Tools are provided to
 make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative!
 
-The official docs can be found at [https://wails.app](https://wails.app).
+<span id="nav-3-1"></span>
+<hr/>
+<h3><strong>PLEASE NOTE: As we are approaching the v2 release, we are not accepting any new feature requests or bug reports for v1. If you have a critical issue, please open a ticket and state why it is critical.</strong></h3>
+<hr/>
 
-Click [here](https://wails.io) if you are interested in trying out v2 Beta for Windows.
+### Version 2
 
-<span id="nav-2"></span>
+Wails v2 has been released in Beta for all 3 platforms. Check out the [new website](https://wails.io) if you are
+interested in trying it out.
 
-## Contents
+### Legacy v1 Website
 
-- [1. Internationalization](#nav-1)
-- [2. Contents](#nav-2)
-- [3. Features](#nav-3)
-- [4. Sponsors](#nav-4)
-- [5. Installation](#nav-5)
-   - [5.1 MacOS](#nav-5-1)
-   - [5.2 Linux](#nav-5-2)
-      - [5.2.1 Debian/Ubuntu](#nav-5-2-1)
-      - [5.2.2 Arch Linux / ArchLabs / Ctlos Linux](#nav-5-2-2)
-      - [5.2.3 Centos](#nav-5-2-3)
-      - [5.2.4 Fedora](#nav-5-2-4)
-      - [5.2.5 VoidLinux & VoidLinux-musl](#nav-5-2-5)
-      - [5.2.6 Gentoo](#nav-5-2-6)
-   - [5.3 Windows](#nav-5-3)
-- [6. Installation](#nav-6)
-- [7. Next Steps](#nav-7)
-- [8. FAQ](#nav-8)
-- [9. Contributors](#nav-9)
-- [10. Special Mentions](#nav-10)
-- [11. Special Thanks](#nav-11)
+The legacy v1 docs can be found at [https://wails.app](https://wails.app).
 
-<span id="nav-3"></span>
+<span id="nav-4"></span>
 
 ## Features
 
 - Use standard Go for the backend
-- Use any frontend technology to build your UI
-- Quickly create Vue, Vuetify or React frontends for your Go programs
-- Expose Go methods/functions to the frontend via a single bind command
-- Uses native rendering engines - no embedded browser
-- Shared events system
-- Native file dialogs
-- Powerful cli tool
+- Use any frontend technology you are already familiar with to build your UI
+- Quickly create rich frontends for your Go programs using pre-built templates
+- Easily call Go methods from Javascript
+- Auto-generated Typescript definitions for your Go structs and methods
+- Native Dialogs & Menus
+- Supports modern translucency and "frosted window" effects
+- Unified eventing system between Go and Javascript
+- Powerful cli tool to quickly generate and build your projects
 - Multiplatform
+- Uses native rendering engines - *no embedded browser*!
 
-<span id="nav-4"></span>
+<span id="nav-5"></span>
 
 ## Sponsors
 
 This project is supported by these kind people / companies:
 
 <a href="https://github.com/sponsors/leaanthony" style="width:100px;">
-  <img src="sponsors/bronze%20sponsor.png" width="100"/>
+  <img src="/img/silver%20sponsor.png" width="100"/>
+</a>
+<a href="https://github.com/selvindev" style="width:100px;">
+  <img src="https://github.com/selvindev.png?size=100" width="100"/>
+</a>
+<br/>
+<br/>
+<a href="https://github.com/sponsors/leaanthony" style="width:100px;">
+  <img src="img/bronze%20sponsor.png" width="100"/>
 </a>
 <a href="https://github.com/snider" style="width:100px;">
   <img src="https://github.com/snider.png?size=100" width="100"/>
 </a>
+<a href="https://github.com/codydbentley" style="width:100px">
+  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+</a>
+<a href="https://www.easywebadv.it/" style="width:100px">
+  <img src="website/static/img/easyweb.png" width="100"/>
+</a>
+<br/>
 <br/>
 <a href="https://github.com/matryer" style="width:100px">
   <img src="https://github.com/matryer.png" width="100"/>
 </a>
 <a href="https://www.jetbrains.com?from=Wails" style="width:100px">
-  <img src="jetbrains-grayscale.png" width="100"/>
+  <img src="/assets/images/jetbrains-grayscale.png" width="100"/>
 </a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
- <img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/tc-hib" style="width:55px">
+ <img src="https://github.com/tc-hib.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/picatz" style="width:50px">
+  <img src="https://github.com/picatz.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/tylertravisty" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/tylertravisty.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/tylertravisty" style="width:50px">
+  <img src="https://github.com/tylertravisty.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/akhudek" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/akhudek" style="width:50px">
+  <img src="https://github.com/akhudek.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/trea" style="width:50px">
+  <img src="https://github.com/trea.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/LanguageAgnostic" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/LanguageAgnostic" style="width:55px">
+  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/fcjr" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/fcjr.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/fcjr" style="width:55px">
+  <img src="https://github.com/fcjr.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/nickarellano" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/nickarellano.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/nickarellano" style="width:60px">
+  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
 </a>
-<a href="https://github.com/bglw" style="width:65px;border-radius: 50%">
-  <img src="https://github.com/bglw.png?size=65" width="65" style="border-radius: 50%"/>
+<a href="https://github.com/bglw" style="width:65px">
+  <img src="https://github.com/bglw.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/jugglingjsons" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/marcus-crane" style="width:65px">
+  <img src="https://github.com/marcus-crane.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/marcus-crane" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/marcus-crane.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/bbergshaven" style="width:45px">
+  <img src="https://github.com/bbergshaven.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/Gilgames000" style="width:45px">
+  <img src="https://github.com/Gilgames000.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/ilgityildirim" style="width:50px">
+  <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/questrail" style="width:50px">
+  <img src="https://github.com/questrail.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/DonTomato" style="width:45px">
+  <img src="https://github.com/DonTomato.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/taigrr" style="width:55px">
+  <img src="https://github.com/taigrr.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/charlie-dee" style="width:55px">
+  <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/EdenNetworkItalia" style="width:65px">
+  <img src="https://github.com/EdenNetworkItalia.png?size=65" width="65"/>
+</a>
+<a href="https://github.com/michaelolson1996" style="width:55px">
+  <img src="https://github.com/michaelolson1996.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/GargantuaX" style="width:45px">
+  <img src="https://github.com/GargantuaX.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/CharlieGo88" style="width:55px">
+  <img src="https://github.com/CharlieGo88.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Bironou" style="width:55px">
+  <img src="https://github.com/Bironou.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Shackelford-Arden" style="width:55px">
+  <img src="https://github.com/Shackelford-Arden.png?size=55" width="55"/>
 </a>
-
-<span id="nav-5"></span>
-
-## Installation
-
-Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as
-an installation of Go. The basic requirements are:
-
-- Go 1.16
-- npm
-
-<span id="nav-5-1"></span>
-
-### MacOS
-
-Make sure you have the xcode command line tools installed. This can be done by running:
-
-`xcode-select --install`
-
-<span id="nav-5-2"></span>
-
-### Linux
-
-<span id="nav-5-2-1"></span>
-
-#### Debian/Ubuntu
-
-`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
-
-_Debian: 8, 9, 10_
-
-_Ubuntu: 16.04, 18.04, 19.04_
-
-_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!\_OS
-
-<span id="nav-5-2-2"></span>
-
-#### Arch Linux / ArchLabs / Ctlos Linux
-
-`sudo pacman -S webkit2gtk gtk3`
-
-_Also succesfully test on: Manjaro & ArcoLinux_
-
-<span id="nav-5-2-3"></span>
-
-#### Centos
-
-`sudo yum install webkitgtk3-devel gtk3-devel`
-
-_CentOS 6, 7_
-
-<span id="nav-5-2-4"></span>
-
-#### Fedora
-
-`sudo yum install webkit2gtk3-devel gtk3-devel`
-
-_Fedora 29, 30_
-
-<span id="nav-5-2-5"></span>
-
-#### VoidLinux & VoidLinux-musl
-
-`xbps-install gtk+3-devel webkit2gtk-devel`
-
-<span id="nav-5-2-6"></span>
-
-#### Gentoo
-
-`sudo emerge gtk+:3 webkit-gtk`
-
-<span id="nav-5-3"></span>
-
-### Windows
-
-Windows requires gcc and related tooling. The recommended download is
-from [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download). Once this is installed, you are good to
-go.
 
 <span id="nav-6"></span>
 
+## Roadmap
+
+The project roadmap may be found [here](https://github.com/wailsapp/wails/discussions/1484). Please consult
+this before open up an enhancement request.
+
 ## Installation
 
-**Ensure Go modules are enabled: GO111MODULE=on and go/bin is in your PATH variable.**
-
-Installation is as simple as running the following command:
-
-<pre style='color:white'>
-go get -u github.com/wailsapp/wails/cmd/wails
-</pre>
-
-<span id="nav-7"></span>
-
-## Next Steps
-
-It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
+The installation instructions are on the [official website](https://wails.io/docs/gettingstarted/installation).
 
 <span id="nav-8"></span>
 
@@ -223,8 +219,8 @@ It is recommended at this stage to read the comprehensive documentation at [http
 - Is this an alternative to Electron?
 
   Depends on your requirements. It's designed to make it easy for Go programmers to make lightweight desktop
-  applications or add a frontend to their existing applications. Whilst Wails does not currently offer hooks into native
-  elements such as menus, this may change in the future.
+  applications or add a frontend to their existing applications. Wails v2 does offer native elements such as menus
+  and dialogs, so it is becoming a lightweight electron alternative.
 
 - Who is this project aimed at?
 
@@ -282,11 +278,11 @@ It is recommended at this stage to read the comprehensive documentation at [http
 <a href="https://github.com/SophieAu"><img src="https://github.com/SophieAu.png?size=40" width="40"/></a>
 <a href="https://github.com/alexmat"><img src="https://github.com/alexmat.png?size=40" width="40"/></a>
 <a href="https://github.com/RH12503"><img src="https://github.com/RH12503.png?size=40" width="40"/></a>
-<a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a></a>
-<a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a></a>
-<a href="https://github.com/aschey"><img src="https://github.com/aschey.png?size=40" width="40"/></a></a>
-<a href="https://github.com/akhudek"><img src="https://github.com/akhudek.png?size=40" width="40"/></a></a>
-<a href="https://github.com/s12chung"><img src="https://github.com/s12chung.png?size=40" width="40"/></a></a>
+<a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a>
+<a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a>
+<a href="https://github.com/aschey"><img src="https://github.com/aschey.png?size=40" width="40"/></a>
+<a href="https://github.com/akhudek"><img src="https://github.com/akhudek.png?size=40" width="40"/></a>
+<a href="https://github.com/s12chung"><img src="https://github.com/s12chung.png?size=40" width="40"/></a>
 
 <span id="nav-10"></span>
 
@@ -322,13 +318,13 @@ This project was mainly coded to the following albums:
 ## Special Thanks
 
 <p align="center" style="text-align: center">
-   <a href="https://pace.dev"><img src="pace.jpeg"/></a><br/>
-   A <i>huge<i/> thanks to <a href="https://pace.dev">Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
+   <a href="https://pace.dev"><img src="/assets/images/pace.jpeg"/></a><br/>
+   A <i>huge</i> thanks to <a href="https://pace.dev">Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
    If you are looking for a Project Management tool that's powerful but quick and easy to use, check them out!<br/><br/>
 </p>
 
 <p align="center" style="text-align: center">
    A special thank you to JetBrains for donating licenses to us!<br/><br/>
    Please click the logo to let them know your appreciation!<br/><br/>
-   <a href="https://www.jetbrains.com?from=Wails"><img src="jetbrains-grayscale.png" width="30%"></a>
+   <a href="https://www.jetbrains.com?from=Wails"><img src="/assets/images/jetbrains-grayscale.png" width="30%"></a>
 </p>

README.zh-Hans.md

@@ -1,61 +1,101 @@
 <p align="center" style="text-align: center">
-   <img src="logo_cropped.png" width="40%"><br/>
+   <img src="logo-universal.png" width="55%"><br/>
 </p>
 <p align="center">
-   使用 Go 和 Web 技术构建桌面应用程序。<br/><br/>
-   <a href="https://github.com/wailsapp/wails/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg"></a>
-   <a href="https://goreportcard.com/report/github.com/wailsapp/wails"><img src="https://goreportcard.com/badge/github.com/wailsapp/wails"/></a>
-   <a href="http://godoc.org/github.com/wailsapp/wails"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"/></a>
-   <a href="https://www.codefactor.io/repository/github/wailsapp/wails"><img src="https://www.codefactor.io/repository/github/wailsapp/wails/badge" alt="CodeFactor" /></a>
-   <a href="https://github.com/wailsapp/wails/issues"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="CodeFactor" /></a>
-   <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=shield"/></a>
-   <a href="https://houndci.com"><img src="https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg"/></a>
-   <a href="https://github.com/avelino/awesome-go" rel="nofollow"><img src="https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg" alt="Awesome"></a>
-   <a href="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" rel="nofollow"><img src="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" alt="Release Pipelines"></a>
+  使用 Go 和 Web 技术构建桌面应用程序。<br/><br/>
+  <a href="https://github.com/wailsapp/wails/blob/master/LICENSE">
+    <img src="https://img.shields.io/badge/License-MIT-blue.svg">
+  </a>
+  <a href="https://goreportcard.com/report/github.com/wailsapp/wails">
+    <img src="https://goreportcard.com/badge/github.com/wailsapp/wails"/>
+  </a>
+  <a href="http://godoc.org/github.com/wailsapp/wails">
+    <img src="https://img.shields.io/badge/godoc-reference-blue.svg"/>
+  </a>
+  <a href="https://www.codefactor.io/repository/github/wailsapp/wails">
+    <img src="https://www.codefactor.io/repository/github/wailsapp/wails/badge" alt="CodeFactor" />
+  </a>
+  <a href="https://github.com/wailsapp/wails/issues">
+    <img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="CodeFactor" />
+  </a>
+  <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_shield" alt="FOSSA Status">
+    <img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=shield"/>
+  </a>
+  <a href="https://houndci.com">
+    <img src="https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg"/>
+  </a>
+  <a href="https://github.com/avelino/awesome-go" rel="nofollow">
+    <img src="https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg" alt="Awesome"/>
+  </a>
+  <a href="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" rel="nofollow">
+    <img src="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" alt="Release Pipelines"/>
+  </a>
 </p>
 
 <span id="nav-1"></span>
 
 ## 国际化
 
-[English](README.md) | 简体中文
-
-向 Go 程序提供 Web 接口的传统方法是通过内置 Web 服务器。Wails 提供了一种不同的方法：它提供了将 Go 代码和 Web
-前端都包装成单个二进制文件的能力。通过提供工具，可以很轻松的完成项目的创建、编译和打包。你所要做的就是发挥创意！
-
-官方文档可以在 [https://wails.app](https://wails.app) 中找到。
-
-国内镜像站点 [https://wails.top](https://wails.top)。
+[English](README.md) | [简体中文](README.zh-Hans.md)
 
 <span id="nav-2"></span>
 
 ## 内容目录
 
+<details>
+  <summary>点我 打开/关闭 目录列表</summary>
+
 - [1. 国际化](#nav-1)
 - [2. 内容目录](#nav-2)
-- [3. 特征](#nav-3)
-- [4. 赞助商](#nav-4)
-- [5. 安装](#nav-5)
-    - [5.1 MacOS](#nav-5-1)
-    - [5.2 Linux](#nav-5-2)
-        - [5.2.1 Debian/Ubuntu](#nav-5-2-1)
-        - [5.2.2 Arch Linux / ArchLabs / Ctlos Linux](#nav-5-2-2)
-        - [5.2.3 Centos](#nav-5-2-3)
-        - [5.2.4 Fedora](#nav-5-2-4)
-        - [5.2.5 VoidLinux & VoidLinux-musl](#nav-5-2-5)
-        - [5.2.6 Gentoo](#nav-5-2-6)
-    - [5.3 Windows](#nav-5-3)
+- [3. 项目介绍](#nav-3)
+  - [3.1 官方网站](#nav-3-1)
+- [4. 功能](#nav-4)
+- [5. 赞助商](#nav-5)
 - [6. 安装](#nav-6)
-- [7. 下一步](#nav-7)
+  - [6.1 MacOS](#nav-6-1)
+  - [6.2 Linux](#nav-6-2)
+    - [6.2.1 Debian/Ubuntu](#nav-6-2-1)
+    - [6.2.2 Arch Linux / ArchLabs / Ctlos Linux](#nav-6-2-2)
+    - [6.2.3 Centos](#nav-6-2-3)
+    - [6.2.4 Fedora](#nav-6-2-4)
+    - [6.2.5 VoidLinux & VoidLinux-musl](#nav-6-2-5)
+    - [6.2.6 Gentoo](#nav-6-2-6)
+  - [6.3 Windows](#nav-6-3)
+- [7. 使用方法](#nav-7)
+  - [7.1 下一步](#nav-7-1)
 - [8. 常见问题](#nav-8)
 - [9. 贡献者](#nav-9)
 - [10. 特别提及](#nav-10)
-- [11. 许可协议](#nav-11)
-- [12. 特别感谢](#nav-12)
+- [12. 特别感谢](#nav-11)
+
+</details>
 
 <span id="nav-3"></span>
 
-## 特征
+## 项目介绍
+
+为 Go 程序提供 Web 界面的传统方法是通过内置 Web 服务器。Wails 提供了一种不同的方法：它提供了将 Go 代码和 Web
+前端一起打包成单个二进制文件的能力。通过提供的工具，可以很轻松的完成项目的创建、编译和打包。你所要做的就是发挥想象力！
+
+<span id="nav-3-1"></span>
+
+### 官方网站
+
+#### v1
+
+官方文档可以在 [https://wails.app](https://wails.app) 中找到。
+
+#### v2
+
+Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝试一下，请查看[新网站](https://wails.io)。
+
+镜像网站：
+
+- [中国大陆镜像站点 - https://wails.top](https://wails.top)
+
+<span id="nav-4"></span>
+
+## 功能
 
 - 后端使用标准 Go
 - 使用任意前端技术构建 UI 界面
@@ -67,56 +107,110 @@
 - 强大的命令行工具
 - 跨多个平台
 
-<span id="nav-4"></span>
+<span id="nav-5"></span>
 
 ## 赞助商
 
 这个项目由以下这些人或者公司支持：
 
+<a href="https://github.com/sponsors/leaanthony" style="width:100px;">
+  <img src="/img/silver%20sponsor.png" width="100"/>
+</a>
+<a href="https://github.com/selvindev" style="width:100px;">
+  <img src="https://github.com/selvindev.png?size=100" width="100"/>
+</a>
+<br/>
+<br/>
+<a href="https://github.com/sponsors/leaanthony" style="width:100px;">
+  <img src="img/bronze%20sponsor.png" width="100"/>
+</a>
+<a href="https://github.com/snider" style="width:100px;">
+  <img src="https://github.com/snider.png?size=100" width="100"/>
+</a>
+<a href="https://github.com/codydbentley" style="width:100px">
+  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+</a>
+<a href="https://www.easywebadv.it/" style="width:100px">
+  <img src="website/static/img/easyweb.png" width="100"/>
+</a>
+<br/>
+<br/>
 <a href="https://github.com/matryer" style="width:100px">
   <img src="https://github.com/matryer.png" width="100"/>
 </a>
 <a href="https://www.jetbrains.com?from=Wails" style="width:100px">
-  <img src="jetbrains-grayscale.png" width="100"/>
+  <img src="/assets/images/jetbrains-grayscale.png" width="100"/>
 </a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
- <img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/tc-hib" style="width:55px">
+ <img src="https://github.com/tc-hib.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/picatz" style="width:50px">
+  <img src="https://github.com/picatz.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/tylertravisty" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/tylertravisty.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/tylertravisty" style="width:50px">
+  <img src="https://github.com/tylertravisty.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/akhudek" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/akhudek" style="width:50px">
+  <img src="https://github.com/akhudek.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/trea" style="width:50px">
+  <img src="https://github.com/trea.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/LanguageAgnostic" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/LanguageAgnostic" style="width:55px">
+  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/snider" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/snider.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/fcjr" style="width:55px">
+  <img src="https://github.com/fcjr.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/fcjr" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/fcjr.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/nickarellano" style="width:60px">
+  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
 </a>
-<a href="https://github.com/nickarellano" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/nickarellano.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/bglw" style="width:65px">
+  <img src="https://github.com/bglw.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/bglw" style="width:65px;border-radius: 50%">
-  <img src="https://github.com/bglw.png?size=65" width="65" style="border-radius: 50%"/>
+<a href="https://github.com/marcus-crane" style="width:65px">
+  <img src="https://github.com/marcus-crane.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/jugglingjsons" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/bbergshaven" style="width:45px">
+  <img src="https://github.com/bbergshaven.png?size=45" width="45"/>
 </a>
-<a href="https://github.com/marcus-crane" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/marcus-crane.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/Gilgames000" style="width:45px">
+  <img src="https://github.com/Gilgames000.png?size=45" width="45"/>
 </a>
-
-<span id="nav-5"></span>
+<a href="https://github.com/ilgityildirim" style="width:50px">
+  <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/questrail" style="width:50px">
+  <img src="https://github.com/questrail.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/DonTomato" style="width:45px">
+  <img src="https://github.com/DonTomato.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/taigrr" style="width:55px">
+  <img src="https://github.com/taigrr.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/charlie-dee" style="width:55px">
+  <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/EdenNetworkItalia" style="width:65px">
+  <img src="https://github.com/EdenNetworkItalia.png?size=65" width="65"/>
+</a>
+<a href="https://github.com/michaelolson1996" style="width:55px">
+  <img src="https://github.com/michaelolson1996.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/GargantuaX" style="width:45px">
+  <img src="https://github.com/GargantuaX.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/CharlieGo88" style="width:55px">
+  <img src="https://github.com/CharlieGo88.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Bironou" style="width:55px">
+  <img src="https://github.com/Bironou.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Shackelford-Arden" style="width:55px">
+  <img src="https://github.com/Shackelford-Arden.png?size=55" width="55"/>
+</a>
+<span id="nav-6"></span>
 
 ## 安装
 
@@ -125,7 +219,7 @@ Wails 使用 cgo 与原生渲染引擎结合，因此需要依赖一些平台的
 - Go 1.16
 - npm
 
-<span id="nav-5-1"></span>
+<span id="nav-6-1"></span>
 
 ### MacOS
 
@@ -133,11 +227,11 @@ Wails 使用 cgo 与原生渲染引擎结合，因此需要依赖一些平台的
 
 `xcode-select --install`
 
-<span id="nav-5-2"></span>
+<span id="nav-6-2"></span>
 
 ### Linux
 
-<span id="nav-5-2-1"></span>
+<span id="nav-6-2-1"></span>
 
 #### Debian/Ubuntu
 
@@ -149,7 +243,7 @@ _Ubuntu: 16.04, 18.04, 19.04_
 
 _也成功测试了: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!\_OS
 
-<span id="nav-5-2-2"></span>
+<span id="nav-6-2-2"></span>
 
 #### Arch Linux / ArchLabs / Ctlos Linux
 
@@ -157,7 +251,7 @@ _也成功测试了: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neo
 
 _也成功测试了: Manjaro & ArcoLinux_
 
-<span id="nav-5-2-3"></span>
+<span id="nav-6-2-3"></span>
 
 #### Centos
 
@@ -165,7 +259,7 @@ _也成功测试了: Manjaro & ArcoLinux_
 
 _CentOS 6, 7_
 
-<span id="nav-5-2-4"></span>
+<span id="nav-6-2-4"></span>
 
 #### Fedora
 
@@ -173,39 +267,39 @@ _CentOS 6, 7_
 
 _Fedora 29, 30_
 
-<span id="nav-5-2-5"></span>
+<span id="nav-6-2-5"></span>
 
 #### VoidLinux & VoidLinux-musl
 
 `xbps-install gtk+3-devel webkit2gtk-devel`
 
-<span id="nav-5-2-6"></span>
+<span id="nav-6-2-6"></span>
 
 #### Gentoo
 
 `sudo emerge gtk+:3 webkit-gtk`
 
-<span id="nav-5-3"></span>
+<span id="nav-6-3"></span>
 
 ### Windows
 
 Windows 需要 GCC 和相关工具。 建议从 [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download) 下载， 安装完成，您就可以开始了。
 
-<span id="nav-6"></span>
+<span id="nav-7"></span>
 
-## 安装
+## 使用方法
 
 **确保 Go modules 是开启的：GO111MODULE=on 并且 go/bin 在您的 PATH 变量中。**
 
 安装很简单，运行以下命令：
 
-<pre style='color:white'>
+```
 go get -u github.com/wailsapp/wails/cmd/wails
-</pre>
+```
 
-<span id="nav-7"></span>
+<span id="nav-7-1"></span>
 
-## 下一步
+### 下一步
 
 建议在此时阅读 [https://wails.app](https://wails.app) 上面的文档.
 
@@ -217,14 +311,14 @@ go get -u github.com/wailsapp/wails/cmd/wails
 
   取决于您的要求。它旨在使 Go 程序员可以轻松制作轻量级桌面应用程序或在其现有应用程序中添加前端。尽管 Wails 当前不提供对诸如菜单之类的原生元素的钩子，但将来可能会改变。
 
-- 这个项目针对的是谁?
+- 这个项目针对的是哪些人?
 
   希望将 HTML / JS / CSS 前端与其应用程序捆绑在一起的程序员，而不是借助创建服务并打开浏览器进行查看的方式。
 
 - 名字怎么来的?
 
   当我看到 WebView 时，我想"我真正想要的是围绕构建 WebView 应用程序工作，有点像 Rails 对于 Ruby"。因此，最初它是一个文字游戏（Webview on
-  Rails）。碰巧也是我来自的 [国家](https://en.wikipedia.org/wiki/Wales) 的英文名字的同音。所以就是他了。
+  Rails）。碰巧也是我来自的 [国家](https://en.wikipedia.org/wiki/Wales) 的英文名字的同音。所以就是它了。
 
 <span id="nav-9"></span>
 
@@ -271,10 +365,11 @@ go get -u github.com/wailsapp/wails/cmd/wails
 <a href="https://github.com/SophieAu"><img src="https://github.com/SophieAu.png?size=40" width="40"/></a>
 <a href="https://github.com/alexmat"><img src="https://github.com/alexmat.png?size=40" width="40"/></a>
 <a href="https://github.com/RH12503"><img src="https://github.com/RH12503.png?size=40" width="40"/></a>
-<a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a></a>
-<a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a></a>
-<a href="https://github.com/aschey"><img src="https://github.com/aschey.png?size=40" width="40"/></a></a>
-<a href="https://github.com/akhudek"><img src="https://github.com/akhudek.png?size=40" width="40"/></a></a>
+<a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a>
+<a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a>
+<a href="https://github.com/aschey"><img src="https://github.com/aschey.png?size=40" width="40"/></a>
+<a href="https://github.com/akhudek"><img src="https://github.com/akhudek.png?size=40" width="40"/></a>
+<a href="https://github.com/s12chung"><img src="https://github.com/s12chung.png?size=40" width="40"/></a>
 
 <span id="nav-10"></span>
 
@@ -284,9 +379,9 @@ go get -u github.com/wailsapp/wails/cmd/wails
 
 - [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - 他的支持和反馈是巨大的。
 - [Serge Zaitsev](https://github.com/zserge) - Wails 窗口所使用的 [Webview](https://github.com/zserge/webview) 的作者。
-- [Byron](https://github.com/bh90210) - 有时，Byron 单枪匹马地保持这个项目活着。没有他令人难以置信的投入，我们永远不会得到 v1 。
+- [Byron](https://github.com/bh90210) - 有时，Byron 一个人保持这个项目活跃着。没有他令人难以置信的投入，我们永远不会得到 v1 。
 
-This project was mainly coded to the following albums:
+编写项目代码时伴随着以下专辑：
 
 - [Manic Street Preachers - Resistance Is Futile](https://open.spotify.com/album/1R2rsEUqXjIvAbzM0yHrxA)
 - [Manic Street Preachers - This Is My Truth, Tell Me Yours](https://open.spotify.com/album/4VzCL9kjhgGQeKCiojK1YN)
@@ -304,22 +399,16 @@ This project was mainly coded to the following albums:
 
 <span id="nav-11"></span>
 
-## 许可协议
-
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large)
-
-<span id="nav-12"></span>
-
 ## 特别感谢
 
 <p align="center" style="text-align: center">
-   <a href="https://pace.dev"><img src="pace.jpeg"/></a><br/>
-   <i>非常<i/>感谢<a href="https://pace.dev">Pace</a>对项目的赞助，并帮助将 Wails 移植到 Apple Silicon !<br/><br/>
+   <a href="https://pace.dev"><img src="/assets/images/pace.jpeg"/></a><br/>
+   <i>非常</i> 感谢<a href="https://pace.dev">Pace</a>对项目的赞助，并帮助将 Wails 移植到 Apple Silicon !<br/><br/>
    如果您正在寻找一个强大并且快速和易于使用的项目管理工具，可以看看他们！<br/><br/>
 </p>
 
 <p align="center" style="text-align: center">
    特别感谢 JetBrains 向我们捐赠许可！<br/><br/>
    请点击 logo 让他们知道你的感激之情！<br/><br/>
-   <a href="https://www.jetbrains.com?from=Wails"><img src="jetbrains-grayscale.png" width="30%"></a>
+   <a href="https://www.jetbrains.com?from=Wails"><img src="/assets/images/jetbrains-grayscale.png" width="30%"></a>
 </p>

cmd/fs.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -50,7 +49,7 @@ func (fs *FSHelper) FileExists(path string) bool {
 
 // FindFile returns the first occurrence of match inside path.
 func (fs *FSHelper) FindFile(path, match string) (string, error) {
-	files, err := ioutil.ReadDir(path)
+	files, err := os.ReadDir(path)
 	if err != nil {
 		return "", err
 	}
@@ -69,7 +68,7 @@ func (fs *FSHelper) FindFile(path, match string) (string, error) {
 func (fs *FSHelper) CreateFile(filename string, data []byte) error {
 	// Ensure directory exists
 	fs.MkDirs(filepath.Dir(filename))
-	return ioutil.WriteFile(filename, data, 0644)
+	return os.WriteFile(filename, data, 0644)
 }
 
 // MkDirs creates the given nested directories.
@@ -149,21 +148,11 @@ func (fs *FSHelper) LocalDir(dir string) (*Dir, error) {
 	}, err
 }
 
-// LoadRelativeFile loads the given file relative to the caller's directory
-func (fs *FSHelper) LoadRelativeFile(relativePath string) ([]byte, error) {
-	_, filename, _, _ := runtime.Caller(0)
-	fullPath, err := filepath.Abs(filepath.Join(path.Dir(filename), relativePath))
-	if err != nil {
-		return nil, err
-	}
-	return ioutil.ReadFile(fullPath)
-}
-
 // GetSubdirs will return a list of FQPs to subdirectories in the given directory
 func (d *Dir) GetSubdirs() (map[string]string, error) {
 
 	// Read in the directory information
-	fileInfo, err := ioutil.ReadDir(d.fullPath)
+	fileInfo, err := os.ReadDir(d.fullPath)
 	if err != nil {
 		return nil, err
 	}
@@ -215,7 +204,7 @@ func (fs *FSHelper) SaveAsJSON(data interface{}, filename string) error {
 	e.SetIndent("", "  ")
 	e.Encode(data)
 
-	err := ioutil.WriteFile(filename, buf.Bytes(), 0755)
+	err := os.WriteFile(filename, buf.Bytes(), 0755)
 	if err != nil {
 		return err
 	}
@@ -231,7 +220,7 @@ func (fs *FSHelper) LoadAsString(filename string) (string, error) {
 
 // LoadAsBytes returns the contents of the file as a byte slice
 func (fs *FSHelper) LoadAsBytes(filename string) ([]byte, error) {
-	return ioutil.ReadFile(filename)
+	return os.ReadFile(filename)
 }
 
 // FileMD5 returns the md5sum of the given file

cmd/github.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"sort"
 )
@@ -28,7 +28,7 @@ func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
 	if err != nil {
 		return result, err
 	}
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return result, err
 	}

cmd/linux.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"runtime"
@@ -71,6 +70,12 @@ const (
 	Crux
 	// RHEL distribution
 	RHEL
+	// NixOS distribution
+	NixOS
+	// Artix linux distribution
+	ArtixLinux
+	//Uos distribution
+	Uos
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -91,7 +96,7 @@ func GetLinuxDistroInfo() *DistroInfo {
 	}
 	_, err := os.Stat("/etc/os-release")
 	if !os.IsNotExist(err) {
-		osRelease, _ := ioutil.ReadFile("/etc/os-release")
+		osRelease, _ := os.ReadFile("/etc/os-release")
 		result = parseOsRelease(string(osRelease))
 	}
 	return result
@@ -183,6 +188,12 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = EndeavourOS
 	case "crux":
 		result.Distribution = Crux
+	case "nixos":
+		result.Distribution = NixOS
+	case "artix":
+		result.Distribution = ArtixLinux
+	case "uos":
+		result.Distribution = Uos
 	default:
 		result.Distribution = Unknown
 	}
@@ -274,6 +285,18 @@ func PrtGetInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
+// NixEnvInstalled uses nix-env to see if a package is installed
+func NixEnvInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	nixEnv := program.FindProgram("nix-env")
+	if nixEnv == nil {
+		return false, fmt.Errorf("cannot check dependencies: nix-env not found")
+	}
+	packageName = strings.ReplaceAll(packageName, "+", `\+`)
+	_, _, exitCode, _ := nixEnv.Run("-q", packageName)
+	return exitCode == 0, nil
+}
+
 // RequestSupportForDistribution promts the user to submit a request to support their
 // currently unsupported distribution
 func RequestSupportForDistribution(distroInfo *DistroInfo) error {

cmd/linuxdb.go

@@ -1,11 +1,15 @@
 package cmd
 
 import (
+	_ "embed"
 	"log"
 
 	"gopkg.in/yaml.v3"
 )
 
+//go:embed linuxdb.yaml
+var LinuxDBYaml []byte
+
 // LinuxDB is the database for linux distribution data.
 type LinuxDB struct {
 	Distributions map[string]*Distribution `yaml:"distributions"`
@@ -78,14 +82,10 @@ func (l *LinuxDB) GetDistro(distro string) *Distribution {
 // NewLinuxDB creates a new LinuxDB instance from the bundled
 // linuxdb.yaml file.
 func NewLinuxDB() *LinuxDB {
-	data, err := fs.LoadRelativeFile("./linuxdb.yaml")
-	if err != nil {
-		log.Fatal("Could not load linuxdb.yaml")
-	}
 	result := LinuxDB{
 		Distributions: make(map[string]*Distribution),
 	}
-	err = result.ImportData(data)
+	err := result.ImportData(LinuxDBYaml)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/linuxdb.yaml

@@ -100,6 +100,15 @@ distributions:
         gccversioncommand: *gccdumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
+  uos:
+    id: uos
+    releases:
+      default:
+        version: default
+        name: Uos
+        gccversioncommand: *gccdumpfullversion
+        programs: *debiandefaultprograms
+        libraries: *debiandefaultlibraries
   void:
     id: void
     releases:
@@ -213,6 +222,15 @@ distributions:
         gccversioncommand: *gccdumpversion
         programs: *archdefaultprograms
         libraries: *archdefaultlibraries
+  artix:
+    id: artix 
+    releases:
+      default:
+        version: default
+        name: Artix Linux
+        gccversioncommand: *gccdumpversion
+        programs: *archdefaultprograms
+        libraries: *archdefaultlibraries
   ctlos:
     id: ctlos
     releases:
@@ -345,3 +363,22 @@ distributions:
             help: Please install with `sudo prt-get depinst gtk3` and try again
           - name: webkitgtk
             help: Please install with `sudo prt-get depinst webkitgtk` and try again
+  nixos:
+    id: nixos
+    releases:
+      default:
+        version: default
+        name: NixOS
+        gccversioncommand: *gccdumpversion
+        programs:
+          - name: gcc
+            help: Please install with `nix-env -iA nixos.gcc`
+          - name: pkg-config
+            help: Please install with `nix-env -iA nixos.pkg-config`
+          - name: npm
+            help: Please install with `nix-env -iA nixos.nodejs`
+        libraries:
+          - name: gtk+3
+            help: Please install with `nix-env -iA nixos.gtk3`
+          - name: webkitgtk
+            help: Please install with `nix-env -iA nixos.nodePackages.webkitgtk`

cmd/package.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"image"
 	"image/png"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -244,7 +243,7 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 		// No - create a new plist from our defaults
 		tmpl := template.New("infoPlist")
 		plistFile := filepath.Join(b.getPackageFileBaseDir(), "info.plist")
-		infoPlist, err := ioutil.ReadFile(plistFile)
+		infoPlist, err := os.ReadFile(plistFile)
 		if err != nil {
 			return err
 		}
@@ -258,13 +257,13 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 		}
 
 		// Save to the package
-		err = ioutil.WriteFile(plistFilename, tpl.Bytes(), 0644)
+		err = os.WriteFile(plistFilename, tpl.Bytes(), 0644)
 		if err != nil {
 			return err
 		}
 
 		// Also write to project directory for customisation
-		err = ioutil.WriteFile(customPlist, tpl.Bytes(), 0644)
+		err = os.WriteFile(customPlist, tpl.Bytes(), 0644)
 		if err != nil {
 			return err
 		}
@@ -314,10 +313,12 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 		return err
 	}
 
-	// Generate icon from PNG
-	err = generateWindowsIcon(icon, basename+".ico")
-	if err != nil {
-		return err
+	// Generate icon from PNG if it doesn't exist
+	if !fs.FileExists(basename + ".ico") {
+		err = generateWindowsIcon(icon, basename+".ico")
+		if err != nil {
+			return err
+		}
 	}
 
 	// Copy manifest
@@ -334,12 +335,12 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	tgtRCFile := filepath.Join(outputDir, basename+".rc")
 	if !b.fs.FileExists(tgtRCFile) {
 		srcRCfile := filepath.Join(b.getPackageFileBaseDir(), "wails.rc")
-		rcfilebytes, err := ioutil.ReadFile(srcRCfile)
+		rcfilebytes, err := os.ReadFile(srcRCfile)
 		if err != nil {
 			return err
 		}
 		rcfiledata := strings.Replace(string(rcfilebytes), "$NAME$", basename, -1)
-		err = ioutil.WriteFile(tgtRCFile, []byte(rcfiledata), 0755)
+		err = os.WriteFile(tgtRCFile, []byte(rcfiledata), 0755)
 		if err != nil {
 			return err
 		}
@@ -387,11 +388,11 @@ func (b *PackageHelper) copyIcon() (string, error) {
 
 		// Install default icon
 		iconfile := filepath.Join(b.getPackageFileBaseDir(), "icon.png")
-		iconData, err := ioutil.ReadFile(iconfile)
+		iconData, err := os.ReadFile(iconfile)
 		if err != nil {
 			return "", err
 		}
-		err = ioutil.WriteFile(srcIcon, iconData, 0644)
+		err = os.WriteFile(srcIcon, iconData, 0644)
 		if err != nil {
 			return "", err
 		}

cmd/project.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -310,14 +309,14 @@ func (po *ProjectOptions) WriteProjectConfig() error {
 		return err
 	}
 
-	return ioutil.WriteFile(targetFile, filedata, 0600)
+	return os.WriteFile(targetFile, filedata, 0600)
 }
 
 // LoadConfig loads the project configuration file from the
 // given directory
 func (po *ProjectOptions) LoadConfig(projectDir string) error {
 	targetFile := filepath.Join(projectDir, "project.json")
-	rawBytes, err := ioutil.ReadFile(targetFile)
+	rawBytes, err := os.ReadFile(targetFile)
 	if err != nil {
 		return err
 	}