mirror of
https://github.com/taigrr/wails.git
synced 2026-04-08 08:01:35 -07:00
Compare commits
3 Commits
develop
...
542-use-su
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6dd999757 | ||
|
|
e572345068 | ||
|
|
1ddb74c6ce |
12
.github/FUNDING.yml
vendored
12
.github/FUNDING.yml
vendored
@@ -1,12 +0,0 @@
|
|||||||
# These are supported funding model platforms
|
|
||||||
|
|
||||||
github: [ leaanthony ]
|
|
||||||
patreon: # Replace with a single Patreon username
|
|
||||||
open_collective: # Replace with a single Open Collective username
|
|
||||||
ko_fi: # Replace with a single Ko-fi username
|
|
||||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
|
||||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
|
||||||
liberapay: # Replace with a single Liberapay username
|
|
||||||
issuehunt: # Replace with a single IssueHunt username
|
|
||||||
otechie: # Replace with a single Otechie username
|
|
||||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
name: Deploy mirror | 部署镜像
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [master]
|
|
||||||
# pull_request:
|
|
||||||
# branches: [ main ]
|
|
||||||
|
|
||||||
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: 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"
|
|
||||||
8
.github/workflows/latest-pre.yml
vendored
8
.github/workflows/latest-pre.yml
vendored
@@ -1,10 +1,8 @@
|
|||||||
name: latest pre-release
|
name: latest pre-release
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
tags:
|
tags:
|
||||||
- '**-pre**'
|
- '**-pre**'
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@@ -15,10 +13,10 @@ jobs:
|
|||||||
os: [ubuntu-latest, windows-latest, macOS-latest]
|
os: [ubuntu-latest, windows-latest, macOS-latest]
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Set up Go 1.16
|
- name: Set up Go 1.13
|
||||||
uses: actions/setup-go@v1
|
uses: actions/setup-go@v1
|
||||||
with:
|
with:
|
||||||
go-version: 1.16
|
go-version: 1.13
|
||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: Check out code into the Go module directory
|
- name: Check out code into the Go module directory
|
||||||
|
|||||||
4
.github/workflows/pr.yml
vendored
4
.github/workflows/pr.yml
vendored
@@ -13,10 +13,10 @@ jobs:
|
|||||||
os: [ubuntu-latest, windows-latest, macOS-latest]
|
os: [ubuntu-latest, windows-latest, macOS-latest]
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Set up Go 1.16
|
- name: Set up Go 1.13
|
||||||
uses: actions/setup-go@v1
|
uses: actions/setup-go@v1
|
||||||
with:
|
with:
|
||||||
go-version: 1.16
|
go-version: 1.13
|
||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: Check out code into the Go module directory
|
- name: Check out code into the Go module directory
|
||||||
|
|||||||
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@@ -15,10 +15,10 @@ jobs:
|
|||||||
os: [ubuntu-latest, windows-latest, macOS-latest]
|
os: [ubuntu-latest, windows-latest, macOS-latest]
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Set up Go 1.16
|
- name: Set up Go 1.13
|
||||||
uses: actions/setup-go@v1
|
uses: actions/setup-go@v1
|
||||||
with:
|
with:
|
||||||
go-version: 1.16
|
go-version: 1.13
|
||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: Check out code into the Go module directory
|
- name: Check out code into the Go module directory
|
||||||
|
|||||||
29
.github/workflows/runtime.yml
vendored
29
.github/workflows/runtime.yml
vendored
@@ -1,29 +0,0 @@
|
|||||||
name: Runtime
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- v2-alpha
|
|
||||||
paths:
|
|
||||||
- 'v2/internal/frontend/runtime/**'
|
|
||||||
jobs:
|
|
||||||
rebuild-runtime:
|
|
||||||
name: Rebuild the runtime
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: 14.17.6
|
|
||||||
cache: 'npm'
|
|
||||||
cache-dependency-path: v2/internal/frontend/runtime/package-lock.json
|
|
||||||
- run: npm install
|
|
||||||
working-directory: v2/internal/frontend/runtime
|
|
||||||
- run: npm run build
|
|
||||||
working-directory: v2/internal/frontend/runtime
|
|
||||||
|
|
||||||
- name: Commit changes
|
|
||||||
uses: devops-infra/action-commit-push@master
|
|
||||||
with:
|
|
||||||
github_token: "${{ secrets.GITHUB_TOKEN }}"
|
|
||||||
commit_prefix: "[AUTO]"
|
|
||||||
commit_message: "The runtime was rebuilt"
|
|
||||||
13
.gitignore
vendored
13
.gitignore
vendored
@@ -17,17 +17,8 @@ cmd/wails/wails
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
tmp
|
tmp
|
||||||
node_modules/
|
node_modules/
|
||||||
package.json.md5
|
|
||||||
v2/test/**/frontend/dist
|
|
||||||
v2/test/**/build/
|
|
||||||
v2/test/frameless/icon.png
|
|
||||||
v2/test/hidden/icon.png
|
|
||||||
v2/test/kitchensink/frontend/public/bundle.*
|
|
||||||
v2/pkg/parser/testproject/frontend/wails
|
|
||||||
v2/test/kitchensink/frontend/public
|
v2/test/kitchensink/frontend/public
|
||||||
|
v2/internal/ffenestri/runtime.c
|
||||||
|
v2/internal/runtime/assets/desktop.js
|
||||||
v2/test/kitchensink/build/darwin/desktop/kitchensink
|
v2/test/kitchensink/build/darwin/desktop/kitchensink
|
||||||
v2/test/kitchensink/frontend/package.json.md5
|
v2/test/kitchensink/frontend/package.json.md5
|
||||||
/v2/internal/ffenestri/windows/test/cmake-build-debug/
|
|
||||||
!v2/internal/ffenestri/windows/x64/webview2.dll
|
|
||||||
!v2/internal/ffenestri/windows/x64/WebView2Loader.dll
|
|
||||||
.idea/
|
|
||||||
|
|||||||
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@@ -1,8 +1,4 @@
|
|||||||
{
|
{
|
||||||
"go.formatTool": "goimports",
|
"go.formatTool": "goimports",
|
||||||
"eslint.alwaysShowStatus": true,
|
"eslint.alwaysShowStatus": true
|
||||||
"files.associations": {
|
|
||||||
"__locale": "c",
|
|
||||||
"ios": "c"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -31,18 +31,12 @@ Wails is what it is because of the time and effort given by these great people.
|
|||||||
* [Christopher Murphy](https://github.com/Splode)
|
* [Christopher Murphy](https://github.com/Splode)
|
||||||
* [Zámbó, Levente](https://github.com/Lyimmi)
|
* [Zámbó, Levente](https://github.com/Lyimmi)
|
||||||
* [artem](https://github.com/Unix4ever)
|
* [artem](https://github.com/Unix4ever)
|
||||||
* [Tim Kipp](https://github.com/timkippdev)
|
* [Tim Kipp](https://github.com/timkippdev)
|
||||||
* [Dmitry Gomzyakov](https://github.com/kyoto44)
|
* [Dmitry Gomzyakov](https://github.com/kyoto44)
|
||||||
* [Arthur Wiebe](https://github.com/artooro)
|
* [Arthur Wiebe](https://github.com/artooro)
|
||||||
* [Ilgıt Yıldırım](https://github.com/ilgityildirim)
|
* [Ilgıt Yıldırım](https://github.com/ilgityildirim)
|
||||||
* [Altynbek](https://github.com/gelleson)
|
* [Altynbek](https://github.com/gelleson)
|
||||||
* [Kyle](https://github.com/kmuchmore)
|
* [Kyle](https://github.com/kmuchmore)
|
||||||
* [Balakrishna Prasad Ganne](https://github.com/aayush420)
|
* [Balakrishna Prasad Ganne](https://github.com/aayush420)
|
||||||
* [Charaf Rezrazi](https://github.com/Rezrazi)
|
* [Charaf Rezrazi](https://github.com/Rezrazi)
|
||||||
* [misitebao](https://github.com/misitebao)
|
* [misitebao](https://github.com/misitebao)
|
||||||
* [Elie Grenon](https://github.com/DrunkenPoney)
|
|
||||||
* [SophieAu](https://github.com/SophieAu)
|
|
||||||
* [Alexander Matviychuk](https://github.com/alexmat)
|
|
||||||
* [RH12503](https://github.com/RH12503)
|
|
||||||
* [hi019](https://github.com/hi019)
|
|
||||||
* [Igor Minen](https://github.com/Igogrek)
|
|
||||||
278
README.md
278
README.md
@@ -1,8 +1,8 @@
|
|||||||
<p align="center" style="text-align: center">
|
<p align="center" style="text-align: center">
|
||||||
<img src="logo.png" width="55%"><br/>
|
<img src="logo_cropped.png" width="40%"><br/>
|
||||||
</p>
|
</p>
|
||||||
<p align="center">
|
<p align="center">
|
||||||
Build desktop applications using Go & Web Technologies.<br/><br/>
|
A framework for building 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://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="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="http://godoc.org/github.com/wailsapp/wails"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"/></a>
|
||||||
@@ -14,50 +14,13 @@
|
|||||||
<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>
|
<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>
|
</p>
|
||||||
|
|
||||||
<span id="nav-1"></span>
|
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!
|
||||||
|
|
||||||
## Internationalization
|
|
||||||
|
|
||||||
English | [简体中文](README.zh-Hans.md)
|
|
||||||
|
|
||||||
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).
|
The official docs can be found at [https://wails.app](https://wails.app).
|
||||||
|
|
||||||
Click [here](https://wails.io) if you are interested in trying out v2 Beta for Windows.
|
|
||||||
|
|
||||||
<span id="nav-2"></span>
|
|
||||||
|
|
||||||
## Contents
|
|
||||||
|
|
||||||
- [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)
|
|
||||||
|
|
||||||
<span id="nav-3"></span>
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- Use standard Go for the backend
|
- Use standard Go libraries/frameworks for the backend
|
||||||
- Use any frontend technology to build your UI
|
- Use any frontend technology to build your UI
|
||||||
- Quickly create Vue, Vuetify or React frontends for your Go programs
|
- Quickly create Vue, Vuetify or React frontends for your Go programs
|
||||||
- Expose Go methods/functions to the frontend via a single bind command
|
- Expose Go methods/functions to the frontend via a single bind command
|
||||||
@@ -67,105 +30,22 @@ Click [here](https://wails.io) if you are interested in trying out v2 Beta for W
|
|||||||
- Powerful cli tool
|
- Powerful cli tool
|
||||||
- Multiplatform
|
- Multiplatform
|
||||||
|
|
||||||
<span id="nav-4"></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"/>
|
|
||||||
</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>
|
|
||||||
<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="/img/jetbrains-grayscale.png" width="100"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/picatz.png?size=50" width="50"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/akhudek.png?size=50" width="50"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/nickarellano.png?size=60" width="60"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
|
|
||||||
</a>
|
|
||||||
<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/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/ondoki" style="width:65px">
|
|
||||||
<img src="https://github.com/ondoki.png?size=65" width="65"/>
|
|
||||||
</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>
|
|
||||||
|
|
||||||
<span id="nav-5"></span>
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as
|
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:
|
||||||
an installation of Go. The basic requirements are:
|
|
||||||
|
|
||||||
- Go 1.16
|
- Go 1.13
|
||||||
- npm
|
- npm
|
||||||
|
|
||||||
<span id="nav-5-1"></span>
|
|
||||||
|
|
||||||
### MacOS
|
### MacOS
|
||||||
|
|
||||||
Make sure you have the xcode command line tools installed. This can be done by running:
|
Make sure you have the xcode command line tools installed. This can be done by running:
|
||||||
|
|
||||||
`xcode-select --install`
|
`xcode-select --install`
|
||||||
|
|
||||||
<span id="nav-5-2"></span>
|
|
||||||
|
|
||||||
### Linux
|
### Linux
|
||||||
|
|
||||||
<span id="nav-5-2-1"></span>
|
|
||||||
|
|
||||||
#### Debian/Ubuntu
|
#### Debian/Ubuntu
|
||||||
|
|
||||||
`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
|
`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
|
||||||
@@ -174,9 +54,7 @@ _Debian: 8, 9, 10_
|
|||||||
|
|
||||||
_Ubuntu: 16.04, 18.04, 19.04_
|
_Ubuntu: 16.04, 18.04, 19.04_
|
||||||
|
|
||||||
_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!\_OS
|
_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
|
#### Arch Linux / ArchLabs / Ctlos Linux
|
||||||
|
|
||||||
@@ -184,43 +62,29 @@ _Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, K
|
|||||||
|
|
||||||
_Also succesfully test on: Manjaro & ArcoLinux_
|
_Also succesfully test on: Manjaro & ArcoLinux_
|
||||||
|
|
||||||
<span id="nav-5-2-3"></span>
|
|
||||||
|
|
||||||
#### Centos
|
#### Centos
|
||||||
|
|
||||||
`sudo yum install webkitgtk3-devel gtk3-devel`
|
`sudo yum install webkitgtk3-devel gtk3-devel`
|
||||||
|
|
||||||
_CentOS 6, 7_
|
_CentOS 6, 7_
|
||||||
|
|
||||||
<span id="nav-5-2-4"></span>
|
|
||||||
|
|
||||||
#### Fedora
|
#### Fedora
|
||||||
|
|
||||||
`sudo yum install webkit2gtk3-devel gtk3-devel`
|
`sudo yum install webkit2gtk3-devel gtk3-devel`
|
||||||
|
|
||||||
_Fedora 29, 30_
|
_Fedora 29, 30_
|
||||||
|
|
||||||
<span id="nav-5-2-5"></span>
|
|
||||||
|
|
||||||
#### VoidLinux & VoidLinux-musl
|
#### VoidLinux & VoidLinux-musl
|
||||||
|
|
||||||
`xbps-install gtk+3-devel webkit2gtk-devel`
|
`xbps-install gtk+3-devel webkit2gtk-devel`
|
||||||
|
|
||||||
<span id="nav-5-2-6"></span>
|
|
||||||
|
|
||||||
#### Gentoo
|
#### Gentoo
|
||||||
|
|
||||||
`sudo emerge gtk+:3 webkit-gtk`
|
`sudo emerge gtk+:3 webkit-gtk`
|
||||||
|
|
||||||
<span id="nav-5-3"></span>
|
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
|
|
||||||
Windows requires gcc and related tooling. The recommended download is
|
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.
|
||||||
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>
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
@@ -232,122 +96,58 @@ Installation is as simple as running the following command:
|
|||||||
go get -u github.com/wailsapp/wails/cmd/wails
|
go get -u github.com/wailsapp/wails/cmd/wails
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
<span id="nav-7"></span>
|
|
||||||
|
|
||||||
## Next Steps
|
## Next Steps
|
||||||
|
|
||||||
It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
|
It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
|
||||||
|
|
||||||
<span id="nav-8"></span>
|
|
||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
|
|
||||||
- Is this an alternative to Electron?
|
* Is this an alternative to Electron?
|
||||||
|
|
||||||
Depends on your requirements. It's designed to make it easy for Go programmers to make lightweight desktop
|
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. Whilst Wails does not currently offer hooks into native
|
|
||||||
elements such as menus, this may change in the future.
|
|
||||||
|
|
||||||
- Who is this project aimed at?
|
* Who is this project aimed at?
|
||||||
|
|
||||||
Go programmers who want to bundle an HTML/JS/CSS frontend with their applications, without resorting to creating a
|
Go programmers who want to bundle an HTML/JS/CSS frontend with their applications, without resorting to creating a server and opening a browser to view it.
|
||||||
server and opening a browser to view it.
|
|
||||||
|
|
||||||
- What's with the name?
|
* What's with the name?
|
||||||
|
|
||||||
When I saw WebView, I thought "What I really want is tooling around building a WebView app, a bit like Rails is to
|
When I saw WebView, I thought "What I really want is tooling around building a WebView app, a bit like Rails is to Ruby". So initially it was a play on words (Webview on Rails). It just so happened to also be a homophone of the English name for the [Country](https://en.wikipedia.org/wiki/Wales) I am from. So it stuck.
|
||||||
Ruby". So initially it was a play on words (Webview on Rails). It just so happened to also be a homophone of the
|
|
||||||
English name for the [Country](https://en.wikipedia.org/wiki/Wales) I am from. So it stuck.
|
|
||||||
|
|
||||||
<span id="nav-9"></span>
|
## Shoulders of Giants
|
||||||
|
|
||||||
## Contributors
|
|
||||||
|
|
||||||
<a href="https://github.com/qaisjp"><img src="https://github.com/qaisjp.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/alee792"><img src="https://github.com/alee792.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/lanzafame"><img src="https://github.com/lanzafame.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/mattn"><img src="https://github.com/mattn.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/0xflotus"><img src="https://github.com/0xflotus.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/mdhender"><img src="https://github.com/mdhender.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/fishfishfish2104"><img src="https://github.com/fishfishfish2104.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/intelwalk"><img src="https://github.com/intelwalk.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/ocelotsloth"><img src="https://github.com/ocelotsloth.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/bh90210"><img src="https://github.com/bh90210.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/iceleo-com"><img src="https://github.com/iceleo-com.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/fallendusk"><img src="https://github.com/fallendusk.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Chronophylos"><img src="https://github.com/Chronophylos.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Vaelatern"><img src="https://github.com/Vaelatern.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/mewmew"><img src="https://github.com/mewmew.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/kraney"><img src="https://github.com/kraney.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/JackMordaunt"><img src="https://github.com/JackMordaunt.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/MichaelHipp"><img src="https://github.com/MichaelHipp.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/tmclane"><img src="https://github.com/tmclane.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Rested"><img src="https://github.com/Rested.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Jarek-SRT"><img src="https://github.com/Jarek-SRT.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/konez2k"><img src="https://github.com/konez2k.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/sayuthisobri"><img src="https://github.com/sayuthisobri.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/dedo1911"><img src="https://github.com/dedo1911.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/fdidron"><img src="https://github.com/fdidron.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Splode"><img src="https://github.com/Splode.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Lyimmi"><img src="https://github.com/Lyimmi.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Unix4ever"><img src="https://github.com/Unix4ever.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/timkippdev"><img src="https://github.com/timkippdev.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/kyoto44"><img src="https://github.com/kyoto44.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/artooro"><img src="https://github.com/artooro.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/ilgityildirim"><img src="https://github.com/ilgityildirim.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/gelleson"><img src="https://github.com/gelleson.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/kmuchmore"><img src="https://github.com/kmuchmore.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/aayush420"><img src="https://github.com/aayush420.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Rezrazi"><img src="https://github.com/Rezrazi.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/misitebao"><img src="https://github.com/misitebao.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/DrunkenPoney"><img src="https://github.com/DrunkenPoney.png?size=40" width="40"/></a>
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<span id="nav-10"></span>
|
|
||||||
|
|
||||||
## Special Mentions
|
|
||||||
|
|
||||||
Without the following people, this project would never have existed:
|
Without the following people, this project would never have existed:
|
||||||
|
|
||||||
- [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - His support and feedback has been immense. More patience than
|
* [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - His support and feedback has been immense. More patience than you can throw a stick at (Not long now Dustin!).
|
||||||
you can throw a stick at (Not long now Dustin!).
|
* [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses for the windowing.
|
||||||
- [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses
|
|
||||||
for the windowing.
|
And without [these people](CONTRIBUTORS.md), it wouldn't be what it is today. A huge thank you to each and every one of you!
|
||||||
- [Byron](https://github.com/bh90210) - At times, Byron has single handedly kept this project alive. Without his
|
|
||||||
incredible input, we never would have got to v1.
|
Special Mentions:
|
||||||
|
|
||||||
|
* [Byron](https://github.com/bh90210) - At times, Byron has single handedly kept this project alive. Without his incredible input, we never would have got to v1.
|
||||||
|
|
||||||
This project was mainly coded to the following albums:
|
This project was mainly coded to the following albums:
|
||||||
|
|
||||||
- [Manic Street Preachers - Resistance Is Futile](https://open.spotify.com/album/1R2rsEUqXjIvAbzM0yHrxA)
|
* [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)
|
* [Manic Street Preachers - This Is My Truth, Tell Me Yours](https://open.spotify.com/album/4VzCL9kjhgGQeKCiojK1YN)
|
||||||
- [The Midnight - Endless Summer](https://open.spotify.com/album/4Krg8zvprquh7TVn9OxZn8)
|
* [The Midnight - Endless Summer](https://open.spotify.com/album/4Krg8zvprquh7TVn9OxZn8)
|
||||||
- [Gary Newman - Savage (Songs from a Broken World)](https://open.spotify.com/album/3kMfsD07Q32HRWKRrpcexr)
|
* [Gary Newman - Savage (Songs from a Broken World)](https://open.spotify.com/album/3kMfsD07Q32HRWKRrpcexr)
|
||||||
- [Steve Vai - Passion & Warfare](https://open.spotify.com/album/0oL0OhrE2rYVns4IGj8h2m)
|
* [Steve Vai - Passion & Warfare](https://open.spotify.com/album/0oL0OhrE2rYVns4IGj8h2m)
|
||||||
- [Ben Howard - Every Kingdom](https://open.spotify.com/album/1nJsbWm3Yy2DW1KIc1OKle)
|
* [Ben Howard - Every Kingdom](https://open.spotify.com/album/1nJsbWm3Yy2DW1KIc1OKle)
|
||||||
- [Ben Howard - Noonday Dream](https://open.spotify.com/album/6astw05cTiXEc2OvyByaPs)
|
* [Ben Howard - Noonday Dream](https://open.spotify.com/album/6astw05cTiXEc2OvyByaPs)
|
||||||
- [Adwaith - Melyn](https://open.spotify.com/album/2vBE40Rp60tl7rNqIZjaXM)
|
* [Adwaith - Melyn](https://open.spotify.com/album/2vBE40Rp60tl7rNqIZjaXM)
|
||||||
- [Gwidaith Hen Fran - Cedors Hen Wrach](https://open.spotify.com/album/3v2hrfNGINPLuDP0YDTOjm)
|
* [Gwidaith Hen Fran - Cedors Hen Wrach](https://open.spotify.com/album/3v2hrfNGINPLuDP0YDTOjm)
|
||||||
- [Metallica - Metallica](https://open.spotify.com/album/2Kh43m04B1UkVcpcRa1Zug)
|
* [Metallica - Metallica](https://open.spotify.com/album/2Kh43m04B1UkVcpcRa1Zug)
|
||||||
- [Bloc Party - Silent Alarm](https://open.spotify.com/album/6SsIdN05HQg2GwYLfXuzLB)
|
* [Bloc Party - Silent Alarm](https://open.spotify.com/album/6SsIdN05HQg2GwYLfXuzLB)
|
||||||
- [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
|
* [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
|
||||||
- [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
|
* [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
|
||||||
|
|
||||||
<span id="nav-11"></span>
|
## Licensing
|
||||||
|
|
||||||
## Special Thanks
|
[](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large)
|
||||||
|
|
||||||
<p align="center" style="text-align: center">
|
## Special Thank You
|
||||||
<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/>
|
|
||||||
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">
|
<p align="center" style="text-align: center">
|
||||||
A special thank you to JetBrains for donating licenses to us!<br/><br/>
|
A special thank you to JetBrains for donating licenses to us!<br/><br/>
|
||||||
|
|||||||
@@ -1,352 +0,0 @@
|
|||||||
<p align="center" style="text-align: center">
|
|
||||||
<img src="logo.png" width="40%"><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>
|
|
||||||
</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)。
|
|
||||||
|
|
||||||
<span id="nav-2"></span>
|
|
||||||
|
|
||||||
## 内容目录
|
|
||||||
|
|
||||||
- [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)
|
|
||||||
- [6. 安装](#nav-6)
|
|
||||||
- [7. 下一步](#nav-7)
|
|
||||||
- [8. 常见问题](#nav-8)
|
|
||||||
- [9. 贡献者](#nav-9)
|
|
||||||
- [10. 特别提及](#nav-10)
|
|
||||||
- [11. 许可协议](#nav-11)
|
|
||||||
- [12. 特别感谢](#nav-12)
|
|
||||||
|
|
||||||
<span id="nav-3"></span>
|
|
||||||
|
|
||||||
## 特征
|
|
||||||
|
|
||||||
- 后端使用标准 Go
|
|
||||||
- 使用任意前端技术构建 UI 界面
|
|
||||||
- 快速为您的 Go 应用生成 Vue、Vuetify、React 前端代码
|
|
||||||
- 通过简单的绑定命令将 Go 方法暴露到前端
|
|
||||||
- 使用原生渲染引擎 - 无嵌入式浏览器
|
|
||||||
- 共享事件系统
|
|
||||||
- 原生文件系统对话框
|
|
||||||
- 强大的命令行工具
|
|
||||||
- 跨多个平台
|
|
||||||
|
|
||||||
<span id="nav-4"></span>
|
|
||||||
|
|
||||||
## 赞助商
|
|
||||||
|
|
||||||
这个项目由以下这些人或者公司支持:
|
|
||||||
|
|
||||||
|
|
||||||
<a href="https://github.com/sponsors/leaanthony" style="width:100px;">
|
|
||||||
<img src="sponsors/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>
|
|
||||||
<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="/img/jetbrains-grayscale.png" width="100"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/picatz.png?size=50" width="50"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/akhudek.png?size=50" width="50"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/nickarellano.png?size=60" width="60"/>
|
|
||||||
</a>
|
|
||||||
<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">
|
|
||||||
<img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
|
|
||||||
</a>
|
|
||||||
<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/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/ondoki" style="width:65px">
|
|
||||||
<img src="https://github.com/ondoki.png?size=65" width="65"/>
|
|
||||||
</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>
|
|
||||||
|
|
||||||
<span id="nav-5"></span>
|
|
||||||
|
|
||||||
## 安装
|
|
||||||
|
|
||||||
Wails 使用 cgo 与原生渲染引擎结合,因此需要依赖一些平台的库以及 Go 的安装。基本要求是:
|
|
||||||
|
|
||||||
- Go 1.16
|
|
||||||
- npm
|
|
||||||
|
|
||||||
<span id="nav-5-1"></span>
|
|
||||||
|
|
||||||
### MacOS
|
|
||||||
|
|
||||||
请确保已安装 xcode 命令行工具。这可以通过运行下面的命令来完成:
|
|
||||||
|
|
||||||
`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_
|
|
||||||
|
|
||||||
_也成功测试了: 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`
|
|
||||||
|
|
||||||
_也成功测试了: 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 需要 GCC 和相关工具。 建议从 [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download) 下载, 安装完成,您就可以开始了。
|
|
||||||
|
|
||||||
<span id="nav-6"></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>
|
|
||||||
|
|
||||||
## 下一步
|
|
||||||
|
|
||||||
建议在此时阅读 [https://wails.app](https://wails.app) 上面的文档.
|
|
||||||
|
|
||||||
<span id="nav-8"></span>
|
|
||||||
|
|
||||||
## 常见问题
|
|
||||||
|
|
||||||
- 它是 Electron 的替代品吗?
|
|
||||||
|
|
||||||
取决于您的要求。它旨在使 Go 程序员可以轻松制作轻量级桌面应用程序或在其现有应用程序中添加前端。尽管 Wails 当前不提供对诸如菜单之类的原生元素的钩子,但将来可能会改变。
|
|
||||||
|
|
||||||
- 这个项目针对的是谁?
|
|
||||||
|
|
||||||
希望将 HTML / JS / CSS 前端与其应用程序捆绑在一起的程序员,而不是借助创建服务并打开浏览器进行查看的方式。
|
|
||||||
|
|
||||||
- 名字怎么来的?
|
|
||||||
|
|
||||||
当我看到 WebView 时,我想"我真正想要的是围绕构建 WebView 应用程序工作,有点像 Rails 对于 Ruby"。因此,最初它是一个文字游戏(Webview on
|
|
||||||
Rails)。碰巧也是我来自的 [国家](https://en.wikipedia.org/wiki/Wales) 的英文名字的同音。所以就是他了。
|
|
||||||
|
|
||||||
<span id="nav-9"></span>
|
|
||||||
|
|
||||||
## 贡献者
|
|
||||||
|
|
||||||
<a href="https://github.com/qaisjp"><img src="https://github.com/qaisjp.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/alee792"><img src="https://github.com/alee792.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/lanzafame"><img src="https://github.com/lanzafame.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/mattn"><img src="https://github.com/mattn.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/0xflotus"><img src="https://github.com/0xflotus.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/mdhender"><img src="https://github.com/mdhender.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/fishfishfish2104"><img src="https://github.com/fishfishfish2104.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/intelwalk"><img src="https://github.com/intelwalk.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/ocelotsloth"><img src="https://github.com/ocelotsloth.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/bh90210"><img src="https://github.com/bh90210.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/iceleo-com"><img src="https://github.com/iceleo-com.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/fallendusk"><img src="https://github.com/fallendusk.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Chronophylos"><img src="https://github.com/Chronophylos.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Vaelatern"><img src="https://github.com/Vaelatern.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/mewmew"><img src="https://github.com/mewmew.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/kraney"><img src="https://github.com/kraney.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/JackMordaunt"><img src="https://github.com/JackMordaunt.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/MichaelHipp"><img src="https://github.com/MichaelHipp.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/tmclane"><img src="https://github.com/tmclane.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Rested"><img src="https://github.com/Rested.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Jarek-SRT"><img src="https://github.com/Jarek-SRT.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/konez2k"><img src="https://github.com/konez2k.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/sayuthisobri"><img src="https://github.com/sayuthisobri.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/dedo1911"><img src="https://github.com/dedo1911.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/fdidron"><img src="https://github.com/fdidron.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Splode"><img src="https://github.com/Splode.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Lyimmi"><img src="https://github.com/Lyimmi.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Unix4ever"><img src="https://github.com/Unix4ever.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/timkippdev"><img src="https://github.com/timkippdev.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/kyoto44"><img src="https://github.com/kyoto44.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/artooro"><img src="https://github.com/artooro.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/ilgityildirim"><img src="https://github.com/ilgityildirim.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/gelleson"><img src="https://github.com/gelleson.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/kmuchmore"><img src="https://github.com/kmuchmore.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/aayush420"><img src="https://github.com/aayush420.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/Rezrazi"><img src="https://github.com/Rezrazi.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/misitebao"><img src="https://github.com/misitebao.png?size=40" width="40"/></a>
|
|
||||||
<a href="https://github.com/DrunkenPoney"><img src="https://github.com/DrunkenPoney.png?size=40" width="40"/></a>
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<span id="nav-10"></span>
|
|
||||||
|
|
||||||
## 特别提及
|
|
||||||
|
|
||||||
如果没有以下人员,此项目或许永远不会存在:
|
|
||||||
|
|
||||||
- [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 。
|
|
||||||
|
|
||||||
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)
|
|
||||||
- [The Midnight - Endless Summer](https://open.spotify.com/album/4Krg8zvprquh7TVn9OxZn8)
|
|
||||||
- [Gary Newman - Savage (Songs from a Broken World)](https://open.spotify.com/album/3kMfsD07Q32HRWKRrpcexr)
|
|
||||||
- [Steve Vai - Passion & Warfare](https://open.spotify.com/album/0oL0OhrE2rYVns4IGj8h2m)
|
|
||||||
- [Ben Howard - Every Kingdom](https://open.spotify.com/album/1nJsbWm3Yy2DW1KIc1OKle)
|
|
||||||
- [Ben Howard - Noonday Dream](https://open.spotify.com/album/6astw05cTiXEc2OvyByaPs)
|
|
||||||
- [Adwaith - Melyn](https://open.spotify.com/album/2vBE40Rp60tl7rNqIZjaXM)
|
|
||||||
- [Gwidaith Hen Fran - Cedors Hen Wrach](https://open.spotify.com/album/3v2hrfNGINPLuDP0YDTOjm)
|
|
||||||
- [Metallica - Metallica](https://open.spotify.com/album/2Kh43m04B1UkVcpcRa1Zug)
|
|
||||||
- [Bloc Party - Silent Alarm](https://open.spotify.com/album/6SsIdN05HQg2GwYLfXuzLB)
|
|
||||||
- [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
|
|
||||||
- [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
|
|
||||||
|
|
||||||
<span id="nav-11"></span>
|
|
||||||
|
|
||||||
## 许可协议
|
|
||||||
|
|
||||||
[](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/>
|
|
||||||
如果您正在寻找一个强大并且快速和易于使用的项目管理工具,可以看看他们!<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>
|
|
||||||
</p>
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
//go:build linux || darwin || !windows
|
|
||||||
// +build linux darwin !windows
|
// +build linux darwin !windows
|
||||||
|
|
||||||
package wails
|
package wails
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
//go:build windows || !linux || !darwin
|
|
||||||
// +build windows !linux !darwin
|
// +build windows !linux !darwin
|
||||||
|
|
||||||
package wails
|
package wails
|
||||||
|
|||||||
10
cmd/cmd-mewn.go
Normal file
10
cmd/cmd-mewn.go
Normal file
File diff suppressed because one or more lines are too long
@@ -24,7 +24,7 @@ func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
|
|||||||
result := []*SemanticVersion{}
|
result := []*SemanticVersion{}
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/releases")
|
resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return result, err
|
return result, err
|
||||||
}
|
}
|
||||||
|
|||||||
139
cmd/helpers.go
139
cmd/helpers.go
@@ -2,6 +2,7 @@ package cmd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"os/user"
|
"os/user"
|
||||||
@@ -11,12 +12,13 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/leaanthony/mewn"
|
||||||
|
"github.com/leaanthony/mewn/lib"
|
||||||
"github.com/leaanthony/slicer"
|
"github.com/leaanthony/slicer"
|
||||||
"github.com/leaanthony/spinner"
|
"github.com/leaanthony/spinner"
|
||||||
wailsruntime "github.com/wailsapp/wails/runtime"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const xgoVersion = "1.16.3"
|
const xgoVersion = "1.0.1"
|
||||||
|
|
||||||
var fs = NewFSHelper()
|
var fs = NewFSHelper()
|
||||||
|
|
||||||
@@ -46,7 +48,7 @@ func InstallGoDependencies(verbose bool) error {
|
|||||||
depSpinner.SetSpinSpeed(50)
|
depSpinner.SetSpinSpeed(50)
|
||||||
depSpinner.Start()
|
depSpinner.Start()
|
||||||
}
|
}
|
||||||
err := NewProgramHelper(verbose).RunCommand("go mod tidy")
|
err := NewProgramHelper(verbose).RunCommand("go get")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !verbose {
|
if !verbose {
|
||||||
depSpinner.Error()
|
depSpinner.Error()
|
||||||
@@ -59,6 +61,30 @@ func InstallGoDependencies(verbose bool) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EmbedAssets will embed the built frontend assets via mewn.
|
||||||
|
func EmbedAssets() ([]string, error) {
|
||||||
|
mewnFiles := lib.GetMewnFiles([]string{}, false)
|
||||||
|
|
||||||
|
referencedAssets, err := lib.GetReferencedAssets(mewnFiles)
|
||||||
|
if err != nil {
|
||||||
|
return []string{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
targetFiles := []string{}
|
||||||
|
|
||||||
|
for _, referencedAsset := range referencedAssets {
|
||||||
|
packfileData, err := lib.GeneratePackFileString(referencedAsset, false)
|
||||||
|
if err != nil {
|
||||||
|
return []string{}, err
|
||||||
|
}
|
||||||
|
targetFile := filepath.Join(referencedAsset.BaseDir, referencedAsset.PackageName+"-mewn.go")
|
||||||
|
targetFiles = append(targetFiles, targetFile)
|
||||||
|
ioutil.WriteFile(targetFile, []byte(packfileData), 0644)
|
||||||
|
}
|
||||||
|
|
||||||
|
return targetFiles, nil
|
||||||
|
}
|
||||||
|
|
||||||
func InitializeCrossCompilation(verbose bool) error {
|
func InitializeCrossCompilation(verbose bool) error {
|
||||||
// Check Docker
|
// Check Docker
|
||||||
if err := CheckIfInstalled("docker"); err != nil {
|
if err := CheckIfInstalled("docker"); err != nil {
|
||||||
@@ -101,16 +127,13 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
|
|||||||
// Check build directory
|
// Check build directory
|
||||||
buildDirectory := filepath.Join(fs.Cwd(), "build")
|
buildDirectory := filepath.Join(fs.Cwd(), "build")
|
||||||
if !fs.DirExists(buildDirectory) {
|
if !fs.DirExists(buildDirectory) {
|
||||||
err := fs.MkDir(buildDirectory)
|
fs.MkDir(buildDirectory)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
buildCommand := slicer.String()
|
buildCommand := slicer.String()
|
||||||
userid := 1000
|
userid := 1000
|
||||||
currentUser, _ := user.Current()
|
user, _ := user.Current()
|
||||||
if i, err := strconv.Atoi(currentUser.Uid); err == nil {
|
if i, err := strconv.Atoi(user.Uid); err == nil {
|
||||||
userid = i
|
userid = i
|
||||||
}
|
}
|
||||||
for _, arg := range []string{
|
for _, arg := range []string{
|
||||||
@@ -175,6 +198,11 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
|
|||||||
// BuildNative builds on the target platform itself.
|
// BuildNative builds on the target platform itself.
|
||||||
func BuildNative(binaryName string, forceRebuild bool, buildMode string, projectOptions *ProjectOptions) error {
|
func BuildNative(binaryName string, forceRebuild bool, buildMode string, projectOptions *ProjectOptions) error {
|
||||||
|
|
||||||
|
// Check Mewn is installed
|
||||||
|
if err := CheckMewn(projectOptions.Verbose); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if err := CheckWindres(); err != nil {
|
if err := CheckWindres(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -247,6 +275,12 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
|
|||||||
func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
|
func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
// embed resources
|
||||||
|
targetFiles, err := EmbedAssets()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if projectOptions.CrossCompile {
|
if projectOptions.CrossCompile {
|
||||||
if err := InitializeCrossCompilation(projectOptions.Verbose); err != nil {
|
if err := InitializeCrossCompilation(projectOptions.Verbose); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -262,6 +296,20 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// cleanup temporary embedded assets
|
||||||
|
defer func() {
|
||||||
|
for _, filename := range targetFiles {
|
||||||
|
if err := os.Remove(filename); err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Removed by popular demand
|
||||||
|
// TODO: Potentially add a flag to cleanup
|
||||||
|
// if projectOptions.Platform == "windows" {
|
||||||
|
// helper.CleanWindows(projectOptions)
|
||||||
|
// }
|
||||||
|
}()
|
||||||
|
|
||||||
if projectOptions.CrossCompile {
|
if projectOptions.CrossCompile {
|
||||||
err = BuildDocker(binaryName, buildMode, projectOptions)
|
err = BuildDocker(binaryName, buildMode, projectOptions)
|
||||||
} else {
|
} else {
|
||||||
@@ -326,6 +374,30 @@ func BuildFrontend(projectOptions *ProjectOptions) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CheckMewn checks if mewn is installed and if not, attempts to fetch it
|
||||||
|
func CheckMewn(verbose bool) (err error) {
|
||||||
|
programHelper := NewProgramHelper(verbose)
|
||||||
|
if !programHelper.IsInstalled("mewn") {
|
||||||
|
var buildSpinner *spinner.Spinner
|
||||||
|
if !verbose {
|
||||||
|
buildSpinner = spinner.New()
|
||||||
|
buildSpinner.SetSpinSpeed(50)
|
||||||
|
buildSpinner.Start("Installing Mewn asset packer...")
|
||||||
|
}
|
||||||
|
err := programHelper.InstallGoPackage("github.com/leaanthony/mewn/cmd/mewn")
|
||||||
|
if err != nil {
|
||||||
|
if buildSpinner != nil {
|
||||||
|
buildSpinner.Error()
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if buildSpinner != nil {
|
||||||
|
buildSpinner.Success()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// CheckWindres checks if Windres is installed and if not, aborts
|
// CheckWindres checks if Windres is installed and if not, aborts
|
||||||
func CheckWindres() (err error) {
|
func CheckWindres() (err error) {
|
||||||
if runtime.GOOS != "windows" { // FIXME: Handle windows cross-compile for windows!
|
if runtime.GOOS != "windows" { // FIXME: Handle windows cross-compile for windows!
|
||||||
@@ -421,18 +493,11 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update md5sum file
|
// Update md5sum file
|
||||||
err := os.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
|
ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Install the runtime
|
// Install the runtime
|
||||||
if caller == "build" {
|
err = InstallRuntime(caller, projectDir, projectOptions)
|
||||||
err = InstallProdRuntime(projectDir, projectOptions)
|
|
||||||
} else {
|
|
||||||
err = InstallBridge(projectDir, projectOptions)
|
|
||||||
}
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -445,17 +510,28 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// InstallRuntime installs the correct runtime for the type of build
|
||||||
|
func InstallRuntime(caller string, projectDir string, projectOptions *ProjectOptions) error {
|
||||||
|
if caller == "build" {
|
||||||
|
return InstallProdRuntime(projectDir, projectOptions)
|
||||||
|
}
|
||||||
|
|
||||||
|
return InstallBridge(projectDir, projectOptions)
|
||||||
|
}
|
||||||
|
|
||||||
// InstallBridge installs the relevant bridge javascript library
|
// InstallBridge installs the relevant bridge javascript library
|
||||||
func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
|
func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
|
||||||
|
bridgeFileData := mewn.String("../runtime/assets/bridge.js")
|
||||||
bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
|
bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
|
||||||
err := fs.CreateFile(bridgeFileTarget, wailsruntime.BridgeJS)
|
err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// InstallProdRuntime installs the production runtime
|
// InstallProdRuntime installs the production runtime
|
||||||
func InstallProdRuntime(projectDir string, projectOptions *ProjectOptions) error {
|
func InstallProdRuntime(projectDir string, projectOptions *ProjectOptions) error {
|
||||||
|
prodInit := mewn.String("../runtime/js/runtime/init.js")
|
||||||
bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
|
bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
|
||||||
err := fs.CreateFile(bridgeFileTarget, wailsruntime.InitJS)
|
err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -475,22 +551,7 @@ func ServeProject(projectOptions *ProjectOptions, logger *Logger) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.Yellow("Serving Application: " + location)
|
logger.Yellow("Serving Application: " + location)
|
||||||
var args []string
|
cmd := exec.Command(location)
|
||||||
if len(os.Args) > 2 {
|
|
||||||
foundArgSep := false
|
|
||||||
for index, arg := range os.Args[2:] {
|
|
||||||
if arg == "--" {
|
|
||||||
foundArgSep = true
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if foundArgSep {
|
|
||||||
args = os.Args[index:]
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
logger.Yellow("Passing arguments: %+v", args)
|
|
||||||
}
|
|
||||||
cmd := exec.Command(location, args...)
|
|
||||||
cmd.Stdout = os.Stdout
|
cmd.Stdout = os.Stdout
|
||||||
cmd.Stderr = os.Stderr
|
cmd.Stderr = os.Stderr
|
||||||
err = cmd.Run()
|
err = cmd.Run()
|
||||||
@@ -534,9 +595,3 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
|
|||||||
}
|
}
|
||||||
return ldflags
|
return ldflags
|
||||||
}
|
}
|
||||||
|
|
||||||
func getGitConfigValue(key string) (string, error) {
|
|
||||||
output, err := exec.Command("git", "config", "--get", "--null", key).Output()
|
|
||||||
// When using --null git appends a null character (\u0000) to the command output
|
|
||||||
return strings.TrimRight(string(output), "\u0000"), err
|
|
||||||
}
|
|
||||||
|
|||||||
44
cmd/linux.go
44
cmd/linux.go
@@ -65,17 +65,6 @@ const (
|
|||||||
Solus
|
Solus
|
||||||
// Ctlos Linux distribution
|
// Ctlos Linux distribution
|
||||||
Ctlos
|
Ctlos
|
||||||
// EndeavourOS linux distribution
|
|
||||||
EndeavourOS
|
|
||||||
// Crux linux distribution
|
|
||||||
Crux
|
|
||||||
// RHEL distribution
|
|
||||||
RHEL
|
|
||||||
// NixOS distribution
|
|
||||||
NixOS
|
|
||||||
// Artix linux distribution
|
|
||||||
ArtixLinux
|
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// DistroInfo contains all the information relating to a linux distribution
|
// DistroInfo contains all the information relating to a linux distribution
|
||||||
@@ -138,8 +127,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
|
|||||||
result.Distribution = Fedora
|
result.Distribution = Fedora
|
||||||
case "centos":
|
case "centos":
|
||||||
result.Distribution = CentOS
|
result.Distribution = CentOS
|
||||||
case "rhel":
|
|
||||||
result.Distribution = RHEL
|
|
||||||
case "arch":
|
case "arch":
|
||||||
result.Distribution = Arch
|
result.Distribution = Arch
|
||||||
case "archlabs":
|
case "archlabs":
|
||||||
@@ -184,14 +171,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
|
|||||||
result.Distribution = PopOS
|
result.Distribution = PopOS
|
||||||
case "solus":
|
case "solus":
|
||||||
result.Distribution = Solus
|
result.Distribution = Solus
|
||||||
case "endeavouros":
|
|
||||||
result.Distribution = EndeavourOS
|
|
||||||
case "crux":
|
|
||||||
result.Distribution = Crux
|
|
||||||
case "nixos":
|
|
||||||
result.Distribution = NixOS
|
|
||||||
case "artix":
|
|
||||||
result.Distribution = ArtixLinux
|
|
||||||
default:
|
default:
|
||||||
result.Distribution = Unknown
|
result.Distribution = Unknown
|
||||||
}
|
}
|
||||||
@@ -272,29 +251,6 @@ func RpmInstalled(packageName string) (bool, error) {
|
|||||||
return exitCode == 0, nil
|
return exitCode == 0, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// PrtGetInstalled uses prt-get to see if a package is installed
|
|
||||||
func PrtGetInstalled(packageName string) (bool, error) {
|
|
||||||
program := NewProgramHelper()
|
|
||||||
prtget := program.FindProgram("prt-get")
|
|
||||||
if prtget == nil {
|
|
||||||
return false, fmt.Errorf("cannot check dependencies: prt-get not found")
|
|
||||||
}
|
|
||||||
_, _, exitCode, _ := prtget.Run("isinst", packageName)
|
|
||||||
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
|
// RequestSupportForDistribution promts the user to submit a request to support their
|
||||||
// currently unsupported distribution
|
// currently unsupported distribution
|
||||||
func RequestSupportForDistribution(distroInfo *DistroInfo) error {
|
func RequestSupportForDistribution(distroInfo *DistroInfo) error {
|
||||||
|
|||||||
@@ -138,25 +138,6 @@ distributions:
|
|||||||
help: Please install with `sudo yum install gtk3-devel` and try again
|
help: Please install with `sudo yum install gtk3-devel` and try again
|
||||||
- name: webkitgtk3-devel
|
- name: webkitgtk3-devel
|
||||||
help: Please install with `sudo yum install webkitgtk3-devel` and try again
|
help: Please install with `sudo yum install webkitgtk3-devel` and try again
|
||||||
rhel:
|
|
||||||
id: rhel
|
|
||||||
releases:
|
|
||||||
default:
|
|
||||||
version: default
|
|
||||||
name: Red Hat Enterprise Linux
|
|
||||||
gccversioncommand: *gccdumpversion
|
|
||||||
programs:
|
|
||||||
- name: gcc
|
|
||||||
help: Please install with `sudo yum install gcc-c++ make` and try again
|
|
||||||
- name: pkg-config
|
|
||||||
help: Please install with `sudo yum install pkgconf-pkg-config` and try again
|
|
||||||
- name: npm
|
|
||||||
help: Please install with `sudo yum install epel-release && sudo yum install nodejs` and try again
|
|
||||||
libraries:
|
|
||||||
- name: gtk3-devel
|
|
||||||
help: Please install with `sudo yum install gtk3-devel` and try again
|
|
||||||
- name: webkitgtk3-devel
|
|
||||||
help: Please install with `sudo yum install webkitgtk3-devel` and try again
|
|
||||||
fedora:
|
fedora:
|
||||||
id: fedora
|
id: fedora
|
||||||
releases:
|
releases:
|
||||||
@@ -213,15 +194,6 @@ distributions:
|
|||||||
gccversioncommand: *gccdumpversion
|
gccversioncommand: *gccdumpversion
|
||||||
programs: *archdefaultprograms
|
programs: *archdefaultprograms
|
||||||
libraries: *archdefaultlibraries
|
libraries: *archdefaultlibraries
|
||||||
artix:
|
|
||||||
id: artix
|
|
||||||
releases:
|
|
||||||
default:
|
|
||||||
version: default
|
|
||||||
name: Artix Linux
|
|
||||||
gccversioncommand: *gccdumpversion
|
|
||||||
programs: *archdefaultprograms
|
|
||||||
libraries: *archdefaultlibraries
|
|
||||||
ctlos:
|
ctlos:
|
||||||
id: ctlos
|
id: ctlos
|
||||||
releases:
|
releases:
|
||||||
@@ -231,15 +203,6 @@ distributions:
|
|||||||
gccversioncommand: *gccdumpversion
|
gccversioncommand: *gccdumpversion
|
||||||
programs: *archdefaultprograms
|
programs: *archdefaultprograms
|
||||||
libraries: *archdefaultlibraries
|
libraries: *archdefaultlibraries
|
||||||
endeavouros:
|
|
||||||
id: endeavouros
|
|
||||||
releases:
|
|
||||||
default:
|
|
||||||
version: default
|
|
||||||
name: EndeavourOS
|
|
||||||
gccversioncommand: *gccdumpversion
|
|
||||||
programs: *archdefaultprograms
|
|
||||||
libraries: *archdefaultlibraries
|
|
||||||
manjaro:
|
manjaro:
|
||||||
id: manjaro
|
id: manjaro
|
||||||
releases:
|
releases:
|
||||||
@@ -327,49 +290,11 @@ distributions:
|
|||||||
- name: webkit2gtk3-devel
|
- name: webkit2gtk3-devel
|
||||||
help: Please install with `sudo zypper in webkit2gtk3-devel` and try again
|
help: Please install with `sudo zypper in webkit2gtk3-devel` and try again
|
||||||
opensuse-leap:
|
opensuse-leap:
|
||||||
id: opensuse-leap
|
id: opensuse-leap
|
||||||
releases:
|
releases:
|
||||||
default:
|
default:
|
||||||
version: default
|
version: default
|
||||||
name: openSUSE Leap
|
name: openSUSE Leap
|
||||||
gccversioncommand: *gccdumpfullversion
|
gccversioncommand: *gccdumpfullversion
|
||||||
programs: *opensusedefaultprograms
|
programs: *opensusedefaultprograms
|
||||||
libraries: *opensusedefaultlibraries
|
libraries: *opensusedefaultlibraries
|
||||||
crux:
|
|
||||||
id: crux
|
|
||||||
releases:
|
|
||||||
default:
|
|
||||||
version: default
|
|
||||||
name: Crux Linux
|
|
||||||
gccversioncommand: *gccdumpversion
|
|
||||||
programs:
|
|
||||||
- name: gcc
|
|
||||||
help: Please install with `sudo prt-get depinst gcc-c++ make` and try again
|
|
||||||
- name: pkg-config
|
|
||||||
help: Please install with `sudo prt-get depinst pkg-config` and try again
|
|
||||||
- name: npm
|
|
||||||
help: Please install with `sudo prt-get depinst nodejs` and try again
|
|
||||||
libraries:
|
|
||||||
- name: gtk3
|
|
||||||
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`
|
|
||||||
|
|||||||
@@ -354,7 +354,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
|
|||||||
"docker", "run", "--rm",
|
"docker", "run", "--rm",
|
||||||
"-v", outputDir + ":/build",
|
"-v", outputDir + ":/build",
|
||||||
"--entrypoint", "/bin/sh",
|
"--entrypoint", "/bin/sh",
|
||||||
"wailsapp/xgo:1.16.3",
|
"wailsapp/xgo:latest",
|
||||||
"-c", "/usr/bin/x86_64-w64-mingw32-windres -o /build/" + basename + "-res.syso /build/" + basename + ".rc",
|
"-c", "/usr/bin/x86_64-w64-mingw32-windres -o /build/" + basename + "-res.syso /build/" + basename + ".rc",
|
||||||
}
|
}
|
||||||
if err := NewProgramHelper().RunCommandArray(args); err != nil {
|
if err := NewProgramHelper().RunCommandArray(args); err != nil {
|
||||||
|
|||||||
@@ -24,19 +24,11 @@ func NewSemanticVersion(version string) (*SemanticVersion, error) {
|
|||||||
|
|
||||||
// IsRelease returns true if it's a release version
|
// IsRelease returns true if it's a release version
|
||||||
func (s *SemanticVersion) IsRelease() bool {
|
func (s *SemanticVersion) IsRelease() bool {
|
||||||
// Limit to v1
|
|
||||||
if s.Version.Major() != 1 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return len(s.Version.Prerelease()) == 0 && len(s.Version.Metadata()) == 0
|
return len(s.Version.Prerelease()) == 0 && len(s.Version.Metadata()) == 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsPreRelease returns true if it's a prerelease version
|
// IsPreRelease returns true if it's a prerelease version
|
||||||
func (s *SemanticVersion) IsPreRelease() bool {
|
func (s *SemanticVersion) IsPreRelease() bool {
|
||||||
// Limit to v1
|
|
||||||
if s.Version.Major() != 1 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return len(s.Version.Prerelease()) > 0
|
return len(s.Version.Prerelease()) > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,65 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestSemanticVersion_IsPreRelease(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
version string
|
|
||||||
want bool
|
|
||||||
}{
|
|
||||||
{"v1.6.7-pre0", "v1.6.7-pre0", true},
|
|
||||||
{"v2.6.7+pre0", "v2.6.7+pre0", false},
|
|
||||||
{"v2.6.7", "v2.6.7", false},
|
|
||||||
{"v2.0.0+alpha.1", "v2.0.0+alpha.1", false},
|
|
||||||
{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
|
|
||||||
{"v1.6.7", "v1.6.7", false},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
semanticversion, err := NewSemanticVersion(tt.version)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Invalid semantic version: %s", semanticversion)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s := &SemanticVersion{
|
|
||||||
Version: semanticversion.Version,
|
|
||||||
}
|
|
||||||
if got := s.IsPreRelease(); got != tt.want {
|
|
||||||
t.Errorf("IsPreRelease() = %v, want %v", got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSemanticVersion_IsRelease(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
version string
|
|
||||||
want bool
|
|
||||||
}{
|
|
||||||
{"v1.6.7", "v1.6.7", true},
|
|
||||||
{"v2.6.7-pre0", "v2.6.7-pre0", false},
|
|
||||||
{"v2.6.7", "v2.6.7", false},
|
|
||||||
{"v2.6.7+release", "v2.6.7+release", false},
|
|
||||||
{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
|
|
||||||
{"v1.6.7-pre0", "v1.6.7-pre0", false},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
semanticversion, err := NewSemanticVersion(tt.version)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Invalid semantic version: %s", semanticversion)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s := &SemanticVersion{
|
|
||||||
Version: semanticversion.Version,
|
|
||||||
}
|
|
||||||
if got := s.IsRelease(); got != tt.want {
|
|
||||||
t.Errorf("IsRelease() = %v, want %v", got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -99,16 +99,11 @@ func (s *SystemHelper) setup() error {
|
|||||||
|
|
||||||
if config.Name != "" {
|
if config.Name != "" {
|
||||||
systemConfig["name"] = PromptRequired("What is your name", config.Name)
|
systemConfig["name"] = PromptRequired("What is your name", config.Name)
|
||||||
} else if n, err := getGitConfigValue("user.name"); err == nil && n != "" {
|
|
||||||
systemConfig["name"] = PromptRequired("What is your name", n)
|
|
||||||
} else {
|
} else {
|
||||||
systemConfig["name"] = PromptRequired("What is your name")
|
systemConfig["name"] = PromptRequired("What is your name")
|
||||||
}
|
}
|
||||||
|
|
||||||
if config.Email != "" {
|
if config.Email != "" {
|
||||||
systemConfig["email"] = PromptRequired("What is your email address", config.Email)
|
systemConfig["email"] = PromptRequired("What is your email address", config.Email)
|
||||||
} else if e, err := getGitConfigValue("user.email"); err == nil && e != "" {
|
|
||||||
systemConfig["email"] = PromptRequired("What is your email address", e)
|
|
||||||
} else {
|
} else {
|
||||||
systemConfig["email"] = PromptRequired("What is your email address")
|
systemConfig["email"] = PromptRequired("What is your email address")
|
||||||
}
|
}
|
||||||
@@ -185,7 +180,7 @@ func (s *SystemHelper) Initialise() error {
|
|||||||
return s.setup()
|
return s.setup()
|
||||||
}
|
}
|
||||||
|
|
||||||
// SystemConfig - Defines system wide configuration data
|
// SystemConfig - Defines system wode configuration data
|
||||||
type SystemConfig struct {
|
type SystemConfig struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
@@ -281,9 +276,9 @@ func CheckDependencies(logger *Logger) (bool, error) {
|
|||||||
switch distroInfo.Distribution {
|
switch distroInfo.Distribution {
|
||||||
case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
|
case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
|
||||||
libraryChecker = DpkgInstalled
|
libraryChecker = DpkgInstalled
|
||||||
case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS, ArtixLinux:
|
case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM:
|
||||||
libraryChecker = PacmanInstalled
|
libraryChecker = PacmanInstalled
|
||||||
case CentOS, Fedora, Tumbleweed, Leap, RHEL:
|
case CentOS, Fedora, Tumbleweed, Leap:
|
||||||
libraryChecker = RpmInstalled
|
libraryChecker = RpmInstalled
|
||||||
case Gentoo:
|
case Gentoo:
|
||||||
libraryChecker = EqueryInstalled
|
libraryChecker = EqueryInstalled
|
||||||
@@ -291,10 +286,6 @@ func CheckDependencies(logger *Logger) (bool, error) {
|
|||||||
libraryChecker = XbpsInstalled
|
libraryChecker = XbpsInstalled
|
||||||
case Solus:
|
case Solus:
|
||||||
libraryChecker = EOpkgInstalled
|
libraryChecker = EOpkgInstalled
|
||||||
case Crux:
|
|
||||||
libraryChecker = PrtGetInstalled
|
|
||||||
case NixOS:
|
|
||||||
libraryChecker = NixEnvInstalled
|
|
||||||
default:
|
default:
|
||||||
return false, RequestSupportForDistribution(distroInfo)
|
return false, RequestSupportForDistribution(distroInfo)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "npx ng",
|
"ng": "npx ng",
|
||||||
"serve": "npx ng serve --poll=2000 --host=0.0.0.0",
|
"start": "npx ng serve --poll=2000 --host=0.0.0.0",
|
||||||
"build": "npx ng build --single-bundle true --output-hashing none --prod --bundle-styles false",
|
"build": "npx ng build --single-bundle true --output-hashing none --prod --bundle-styles false",
|
||||||
"test": "npx ng test",
|
"test": "npx ng test",
|
||||||
"lint": "npx ng lint",
|
"lint": "npx ng lint",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -9,14 +9,11 @@ func basic() string {
|
|||||||
return "World!"
|
return "World!"
|
||||||
}
|
}
|
||||||
|
|
||||||
//go:embed frontend/dist/my-app/main.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/dist/my-app/styles.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
js := mewn.String("./frontend/dist/my-app/main.js")
|
||||||
|
css := mewn.String("./frontend/dist/my-app/styles.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
Height: 768,
|
Height: 768,
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
"author": "bh90210 <ktc@pm.me>",
|
"author": "bh90210 <ktc@pm.me>",
|
||||||
"created": "2019-06-15 18:23:48.666414555 +0300 EEST m=+223.934866008",
|
"created": "2019-06-15 18:23:48.666414555 +0300 EEST m=+223.934866008",
|
||||||
"frontenddir": "frontend",
|
"frontenddir": "frontend",
|
||||||
"serve": "npm run serve",
|
"serve": "npx ng serve --poll=2000",
|
||||||
"bridge": "src",
|
"bridge": "src",
|
||||||
"wailsdir": ""
|
"wailsdir": ""
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
"@wailsapp/runtime": "^1.0.10"
|
"@wailsapp/runtime": "^1.0.10"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
"eject": "react-scripts eject"
|
"eject": "react-scripts eject"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -9,14 +9,11 @@ func basic() string {
|
|||||||
return "World!"
|
return "World!"
|
||||||
}
|
}
|
||||||
|
|
||||||
//go:embed frontend/build/static/js/main.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/build/static/css/main.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
js := mewn.String("./frontend/build/static/js/main.js")
|
||||||
|
css := mewn.String("./frontend/build/static/css/main.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
Height: 768,
|
Height: 768,
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
"author": "bh90210 <ktc@pm.me>",
|
"author": "bh90210 <ktc@pm.me>",
|
||||||
"created": "2019-06-07 18:23:48.666414555 +0300 EEST m=+223.934866008",
|
"created": "2019-06-07 18:23:48.666414555 +0300 EEST m=+223.934866008",
|
||||||
"frontenddir": "frontend",
|
"frontenddir": "frontend",
|
||||||
"serve": "npm run serve",
|
"serve": "npm run start",
|
||||||
"bridge": "src",
|
"bridge": "src",
|
||||||
"wailsdir": ""
|
"wailsdir": ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"author": "{{.Author.Name}}<{{.Author.Email}}>",
|
"author": "{{.Author.Name}}<{{.Author.Email}}>",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "rollup -c",
|
"build": "rollup -c",
|
||||||
"serve": "rollup -c -w",
|
"dev": "rollup -c -w",
|
||||||
"start": "sirv public"
|
"start": "sirv public"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import svelte from 'rollup-plugin-svelte';
|
|||||||
import resolve from '@rollup/plugin-node-resolve';
|
import resolve from '@rollup/plugin-node-resolve';
|
||||||
import commonjs from '@rollup/plugin-commonjs';
|
import commonjs from '@rollup/plugin-commonjs';
|
||||||
import livereload from 'rollup-plugin-livereload';
|
import livereload from 'rollup-plugin-livereload';
|
||||||
import {terser} from 'rollup-plugin-terser';
|
import { terser } from 'rollup-plugin-terser';
|
||||||
import image from '@rollup/plugin-image';
|
import image from '@rollup/plugin-image';
|
||||||
import babel from 'rollup-plugin-babel';
|
import babel from 'rollup-plugin-babel';
|
||||||
import polyfill from 'rollup-plugin-polyfill';
|
import polyfill from 'rollup-plugin-polyfill';
|
||||||
@@ -80,6 +80,7 @@ export default {
|
|||||||
{
|
{
|
||||||
targets: '> 0.25%, not dead, IE 11',
|
targets: '> 0.25%, not dead, IE 11',
|
||||||
modules: false,
|
modules: false,
|
||||||
|
spec: true,
|
||||||
useBuiltIns: 'usage',
|
useBuiltIns: 'usage',
|
||||||
forceAllTransforms: true,
|
forceAllTransforms: true,
|
||||||
corejs: 3,
|
corejs: 3,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -9,13 +9,9 @@ func basic() string {
|
|||||||
return "World!"
|
return "World!"
|
||||||
}
|
}
|
||||||
|
|
||||||
//go:embed frontend/public/build/bundle.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/public/build/bundle.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
js := mewn.String("./frontend/public/build/bundle.js")
|
||||||
|
css := mewn.String("./frontend/public/build/bundle.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
"author": "Tim Kipp <timkipp.22.developer@gmail.com>",
|
"author": "Tim Kipp <timkipp.22.developer@gmail.com>",
|
||||||
"created": "2020-09-06 13:06:10.469848 -0700 PDT m=+213.578828559",
|
"created": "2020-09-06 13:06:10.469848 -0700 PDT m=+213.578828559",
|
||||||
"frontenddir": "frontend",
|
"frontenddir": "frontend",
|
||||||
"serve": "npm run serve",
|
"serve": "npm run dev",
|
||||||
"bridge": "src",
|
"bridge": "src",
|
||||||
"wailsdir": ""
|
"wailsdir": ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,15 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed frontend/build/main.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/build/main.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
js := mewn.String("./frontend/build/main.js")
|
||||||
|
css := mewn.String("./frontend/build/main.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
Height: 768,
|
Height: 768,
|
||||||
|
|||||||
@@ -19,16 +19,16 @@
|
|||||||
"@types/mocha": "^8.0.3",
|
"@types/mocha": "^8.0.3",
|
||||||
"@typescript-eslint/eslint-plugin": "^4.3.0",
|
"@typescript-eslint/eslint-plugin": "^4.3.0",
|
||||||
"@typescript-eslint/parser": "^4.3.0",
|
"@typescript-eslint/parser": "^4.3.0",
|
||||||
"@vue/cli-plugin-eslint": "~4.5.9",
|
"@vue/cli-plugin-eslint": "~4.5.6",
|
||||||
"@vue/cli-plugin-router": "~4.5.9",
|
"@vue/cli-plugin-router": "~4.5.6",
|
||||||
"@vue/cli-plugin-typescript": "~4.5.9",
|
"@vue/cli-plugin-typescript": "~4.5.6",
|
||||||
"@vue/cli-plugin-unit-mocha": "~4.5.9",
|
"@vue/cli-plugin-unit-mocha": "~4.5.6",
|
||||||
"@vue/cli-service": "~4.5.9",
|
"@vue/cli-service": "~4.5.6",
|
||||||
"@vue/compiler-sfc": "^3.0.0",
|
"@vue/compiler-sfc": "^3.0.0",
|
||||||
"@vue/eslint-config-typescript": "^7.0.0",
|
"@vue/eslint-config-typescript": "^5.1.0",
|
||||||
"@vue/test-utils": "^2.0.0-0",
|
"@vue/test-utils": "^2.0.0-0",
|
||||||
"chai": "^4.2.0",
|
"chai": "^4.2.0",
|
||||||
"eslint": "<7.0.0",
|
"eslint": "^7.10.0",
|
||||||
"eslint-plugin-vue": "^7.0.0",
|
"eslint-plugin-vue": "^7.0.0",
|
||||||
"node-sass": "^4.14.1",
|
"node-sass": "^4.14.1",
|
||||||
"sass-loader": "^10.0.2",
|
"sass-loader": "^10.0.2",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -9,14 +9,11 @@ func basic() string {
|
|||||||
return "Hello World!"
|
return "Hello World!"
|
||||||
}
|
}
|
||||||
|
|
||||||
//go:embed frontend/dist/app.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/dist/app.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
js := mewn.String("./frontend/dist/app.js")
|
||||||
|
css := mewn.String("./frontend/dist/app.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
Height: 768,
|
Height: 768,
|
||||||
|
|||||||
23
cmd/templates/vue3-js/frontend/.gitignore
vendored
23
cmd/templates/vue3-js/frontend/.gitignore
vendored
@@ -1,23 +0,0 @@
|
|||||||
.DS_Store
|
|
||||||
node_modules
|
|
||||||
/dist
|
|
||||||
|
|
||||||
|
|
||||||
# local env files
|
|
||||||
.env.local
|
|
||||||
.env.*.local
|
|
||||||
|
|
||||||
# Log files
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
pnpm-debug.log*
|
|
||||||
|
|
||||||
# Editor directories and files
|
|
||||||
.idea
|
|
||||||
.vscode
|
|
||||||
*.suo
|
|
||||||
*.ntvs*
|
|
||||||
*.njsproj
|
|
||||||
*.sln
|
|
||||||
*.sw?
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
# vue-js
|
|
||||||
|
|
||||||
## Project setup
|
|
||||||
|
|
||||||
```
|
|
||||||
npm install
|
|
||||||
```
|
|
||||||
|
|
||||||
### Compiles and hot-reloads for development
|
|
||||||
|
|
||||||
```
|
|
||||||
npm run serve
|
|
||||||
```
|
|
||||||
|
|
||||||
### Compiles and minifies for production
|
|
||||||
|
|
||||||
```
|
|
||||||
npm run build
|
|
||||||
```
|
|
||||||
|
|
||||||
### Lints and fixes files
|
|
||||||
|
|
||||||
```
|
|
||||||
npm run lint
|
|
||||||
```
|
|
||||||
|
|
||||||
### Customize configuration
|
|
||||||
|
|
||||||
See [Configuration Reference](https://cli.vuejs.org/config/).
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
presets: [
|
|
||||||
'@vue/cli-plugin-babel/preset'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
12312
cmd/templates/vue3-js/frontend/package-lock.json
generated
12312
cmd/templates/vue3-js/frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,49 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "{{.NPMProjectName}}",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"private": true,
|
|
||||||
"scripts": {
|
|
||||||
"serve": "vue-cli-service serve",
|
|
||||||
"build": "vue-cli-service build",
|
|
||||||
"lint": "vue-cli-service lint"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@wailsapp/runtime": "^1.1.1",
|
|
||||||
"core-js": "^3.6.5",
|
|
||||||
"vue": "^3.0.0",
|
|
||||||
"vue-router": "^4.0.0-0",
|
|
||||||
"vuex": "^4.0.0-0"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@vue/cli-plugin-babel": "~4.5.0",
|
|
||||||
"@vue/cli-plugin-eslint": "~4.5.0",
|
|
||||||
"@vue/cli-plugin-router": "~4.5.0",
|
|
||||||
"@vue/cli-plugin-vuex": "~4.5.0",
|
|
||||||
"@vue/cli-service": "~4.5.0",
|
|
||||||
"@vue/compiler-sfc": "^3.0.0",
|
|
||||||
"babel-eslint": "^10.1.0",
|
|
||||||
"eslint": "^6.7.2",
|
|
||||||
"eslint-plugin-vue": "^7.0.0",
|
|
||||||
"stylus": "^0.54.7",
|
|
||||||
"stylus-loader": "^3.0.2"
|
|
||||||
},
|
|
||||||
"eslintConfig": {
|
|
||||||
"root": true,
|
|
||||||
"env": {
|
|
||||||
"node": true
|
|
||||||
},
|
|
||||||
"extends": [
|
|
||||||
"plugin:vue/vue3-essential",
|
|
||||||
"eslint:recommended"
|
|
||||||
],
|
|
||||||
"parserOptions": {
|
|
||||||
"parser": "babel-eslint"
|
|
||||||
},
|
|
||||||
"rules": {}
|
|
||||||
},
|
|
||||||
"browserslist": [
|
|
||||||
"> 1%",
|
|
||||||
"last 2 versions",
|
|
||||||
"not dead"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
@@ -1,18 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta content="IE=edge" http-equiv="X-UA-Compatible">
|
|
||||||
<meta content="width=device-width,initial-scale=1.0" name="viewport">
|
|
||||||
<link href="<%= BASE_URL %>favicon.ico" rel="icon">
|
|
||||||
<title><%= htmlWebpackPlugin.options.title %></title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<noscript>
|
|
||||||
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
|
|
||||||
Please enable it to continue.</strong>
|
|
||||||
</noscript>
|
|
||||||
<div id="app"></div>
|
|
||||||
<!-- built files will be auto injected -->
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div id="nav">
|
|
||||||
<router-link to="/">Home</router-link> |
|
|
||||||
<router-link to="/about">About</router-link>
|
|
||||||
</div>
|
|
||||||
<router-view />
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style lang="stylus">
|
|
||||||
#app {
|
|
||||||
font-family: Avenir, Helvetica, Arial, sans-serif;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
-moz-osx-font-smoothing: grayscale;
|
|
||||||
text-align: center;
|
|
||||||
color: #2c3e50;
|
|
||||||
}
|
|
||||||
|
|
||||||
#nav {
|
|
||||||
padding: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#nav a {
|
|
||||||
font-weight: bold;
|
|
||||||
color: #2c3e50;
|
|
||||||
}
|
|
||||||
|
|
||||||
#nav a.router-link-exact-active {
|
|
||||||
color: #42b983;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 106 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.7 KiB |
@@ -1,32 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="hello">
|
|
||||||
<h1>{{ msg }}</h1>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
name: "HelloWorld",
|
|
||||||
props: {
|
|
||||||
msg: String,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<!-- Add "scoped" attribute to limit CSS to this component only -->
|
|
||||||
<style scoped>
|
|
||||||
h3 {
|
|
||||||
margin: 40px 0 0;
|
|
||||||
}
|
|
||||||
ul {
|
|
||||||
list-style-type: none;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
li {
|
|
||||||
display: inline-block;
|
|
||||||
margin: 0 10px;
|
|
||||||
}
|
|
||||||
a {
|
|
||||||
color: #42b983;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import {createApp} from 'vue'
|
|
||||||
import App from './App.vue'
|
|
||||||
import router from './router'
|
|
||||||
import store from './store'
|
|
||||||
|
|
||||||
// import wails runtime
|
|
||||||
import * as Wails from '@wailsapp/runtime';
|
|
||||||
|
|
||||||
Wails.Init(() => {
|
|
||||||
createApp(App)
|
|
||||||
.use(store)
|
|
||||||
.use(router)
|
|
||||||
.mount('#app')
|
|
||||||
})
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import {createMemoryHistory, createRouter} from 'vue-router'
|
|
||||||
import Home from '../views/Home.vue'
|
|
||||||
import About from '../views/About.vue'
|
|
||||||
|
|
||||||
|
|
||||||
const routes = [
|
|
||||||
{
|
|
||||||
path: '/',
|
|
||||||
name: 'Home',
|
|
||||||
component: Home
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/about',
|
|
||||||
name: 'About',
|
|
||||||
// You can only use pre-loading to add routes, not the on-demand loading method.
|
|
||||||
component: About
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
||||||
const router = createRouter({
|
|
||||||
history: createMemoryHistory(),
|
|
||||||
routes
|
|
||||||
})
|
|
||||||
|
|
||||||
export default router
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import {createStore} from 'vuex'
|
|
||||||
|
|
||||||
export default createStore({
|
|
||||||
state: {},
|
|
||||||
mutations: {},
|
|
||||||
actions: {},
|
|
||||||
modules: {}
|
|
||||||
})
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="about">
|
|
||||||
<h1>This is an about page</h1>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="home">
|
|
||||||
<img
|
|
||||||
@click="getMessage"
|
|
||||||
alt="Vue logo"
|
|
||||||
src="../assets/appicon.png"
|
|
||||||
:style="{ height: '400px' }"
|
|
||||||
/>
|
|
||||||
<HelloWorld :msg="message" />
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import { ref } from "vue";
|
|
||||||
import HelloWorld from "@/components/HelloWorld.vue";
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: "Home",
|
|
||||||
components: {
|
|
||||||
HelloWorld,
|
|
||||||
},
|
|
||||||
setup() {
|
|
||||||
const message = ref("Click the Icon");
|
|
||||||
|
|
||||||
const getMessage = () => {
|
|
||||||
window.backend
|
|
||||||
.basic()
|
|
||||||
.then((res) => {
|
|
||||||
message.value = res;
|
|
||||||
})
|
|
||||||
.catch((err) => {
|
|
||||||
console.log(err);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
message: message,
|
|
||||||
getMessage: getMessage,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
let cssConfig = {};
|
|
||||||
|
|
||||||
if (process.env.NODE_ENV == 'production') {
|
|
||||||
cssConfig = {
|
|
||||||
extract: {
|
|
||||||
filename: '[name].css',
|
|
||||||
chunkFilename: '[name].css'
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
chainWebpack: config => {
|
|
||||||
let limit = 9999999999999999;
|
|
||||||
config.module
|
|
||||||
.rule('images')
|
|
||||||
.test(/\.(png|gif|jpg)(\?.*)?$/i)
|
|
||||||
.use('url-loader')
|
|
||||||
.loader('url-loader')
|
|
||||||
.tap(options => Object.assign(options, {limit: limit}));
|
|
||||||
config.module
|
|
||||||
.rule('fonts')
|
|
||||||
.test(/\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/i)
|
|
||||||
.use('url-loader')
|
|
||||||
.loader('url-loader')
|
|
||||||
.options({
|
|
||||||
limit: limit
|
|
||||||
});
|
|
||||||
},
|
|
||||||
css: cssConfig,
|
|
||||||
configureWebpack: {
|
|
||||||
output: {
|
|
||||||
filename: '[name].js'
|
|
||||||
},
|
|
||||||
optimization: {
|
|
||||||
splitChunks: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
devServer: {
|
|
||||||
disableHostCheck: true
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
module {{.BinaryName}}
|
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/wailsapp/wails {{.WailsVersion}}
|
|
||||||
)
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
_ "embed"
|
|
||||||
"github.com/wailsapp/wails"
|
|
||||||
)
|
|
||||||
|
|
||||||
func basic() string {
|
|
||||||
return "Hello World!"
|
|
||||||
}
|
|
||||||
|
|
||||||
//go:embed frontend/dist/app.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/dist/app.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
|
||||||
Width: 1024,
|
|
||||||
Height: 768,
|
|
||||||
Title: "{{.Name}}",
|
|
||||||
JS: js,
|
|
||||||
CSS: css,
|
|
||||||
Colour: "#131313",
|
|
||||||
})
|
|
||||||
app.Bind(basic)
|
|
||||||
app.Run()
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "Vue3 JS",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"shortdescription": "A template based on Vue 3, Vue-router, Vuex, and Webpack5",
|
|
||||||
"description": "A template based on Vue 3, Vue-router, Vuex, and Webpack5",
|
|
||||||
"install": "npm install",
|
|
||||||
"build": "npm run build",
|
|
||||||
"author": "Misitebao <i@misitebao.com>",
|
|
||||||
"created": "2021-05-02 17:25:55",
|
|
||||||
"frontenddir": "frontend",
|
|
||||||
"serve": "npm run serve",
|
|
||||||
"bridge": "src",
|
|
||||||
"wailsdir": "",
|
|
||||||
"platforms": [
|
|
||||||
"linux",
|
|
||||||
"darwin"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -9,14 +9,11 @@ func basic() string {
|
|||||||
return "Hello World!"
|
return "Hello World!"
|
||||||
}
|
}
|
||||||
|
|
||||||
//go:embed frontend/dist/app.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/dist/app.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
js := mewn.String("./frontend/dist/app.js")
|
||||||
|
css := mewn.String("./frontend/dist/app.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
Height: 768,
|
Height: 768,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -9,14 +9,11 @@ func basic() string {
|
|||||||
return "Hello World!"
|
return "Hello World!"
|
||||||
}
|
}
|
||||||
|
|
||||||
//go:embed frontend/dist/app.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/dist/app.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
js := mewn.String("./frontend/dist/app.js")
|
||||||
|
css := mewn.String("./frontend/dist/app.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
Height: 768,
|
Height: 768,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "embed"
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails"
|
"github.com/wailsapp/wails"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -9,14 +9,11 @@ func basic() string {
|
|||||||
return "Hello World!"
|
return "Hello World!"
|
||||||
}
|
}
|
||||||
|
|
||||||
//go:embed frontend/dist/app.js
|
|
||||||
var js string
|
|
||||||
|
|
||||||
//go:embed frontend/dist/app.css
|
|
||||||
var css string
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
js := mewn.String("./frontend/dist/app.js")
|
||||||
|
css := mewn.String("./frontend/dist/app.css")
|
||||||
|
|
||||||
app := wails.CreateApp(&wails.AppConfig{
|
app := wails.CreateApp(&wails.AppConfig{
|
||||||
Width: 1024,
|
Width: 1024,
|
||||||
Height: 768,
|
Height: 768,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
// Version - Wails version
|
// Version - Wails version
|
||||||
const Version = "v1.16.7"
|
const Version = "v1.9.1"
|
||||||
|
|||||||
@@ -39,6 +39,12 @@ Create your first project by running 'wails init'.`
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check Mewn
|
||||||
|
err = cmd.CheckMewn(false)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// Check for errors
|
// Check for errors
|
||||||
// CheckDependencies() returns !errors
|
// CheckDependencies() returns !errors
|
||||||
// so to get the right message in this
|
// so to get the right message in this
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
//go:build dev
|
|
||||||
// +build dev
|
// +build dev
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
//go:build dev
|
|
||||||
// +build dev
|
// +build dev
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ func init() {
|
|||||||
projectOptions := projectHelper.NewProjectOptions()
|
projectOptions := projectHelper.NewProjectOptions()
|
||||||
commandDescription := `Generates a new Wails project using the given flags.
|
commandDescription := `Generates a new Wails project using the given flags.
|
||||||
Any flags that are required and not given will be prompted for.`
|
Any flags that are required and not given will be prompted for.`
|
||||||
build := false
|
|
||||||
|
|
||||||
initCommand := app.Command("init", "Initialises a new Wails project").
|
initCommand := app.Command("init", "Initialises a new Wails project").
|
||||||
LongDescription(commandDescription).
|
LongDescription(commandDescription).
|
||||||
@@ -24,8 +23,7 @@ Any flags that are required and not given will be prompted for.`
|
|||||||
StringFlag("template", "Template name", &projectOptions.Template).
|
StringFlag("template", "Template name", &projectOptions.Template).
|
||||||
StringFlag("name", "Project name", &projectOptions.Name).
|
StringFlag("name", "Project name", &projectOptions.Name).
|
||||||
StringFlag("description", "Project description", &projectOptions.Description).
|
StringFlag("description", "Project description", &projectOptions.Description).
|
||||||
StringFlag("output", "Output binary name", &projectOptions.BinaryName).
|
StringFlag("output", "Output binary name", &projectOptions.BinaryName)
|
||||||
BoolFlag("build", "Build project after generating", &build)
|
|
||||||
|
|
||||||
initCommand.Action(func() error {
|
initCommand.Action(func() error {
|
||||||
|
|
||||||
@@ -66,10 +64,6 @@ Any flags that are required and not given will be prompted for.`
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
genSpinner.Success()
|
genSpinner.Success()
|
||||||
if !build {
|
|
||||||
logger.Yellow("Project '%s' initialised. Run `wails build` to build it.", projectOptions.Name)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build the project
|
// Build the project
|
||||||
cwd, _ := os.Getwd()
|
cwd, _ := os.Getwd()
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -53,10 +52,7 @@ func init() {
|
|||||||
|
|
||||||
var b strings.Builder
|
var b strings.Builder
|
||||||
for _, plat := range getSupportedPlatforms() {
|
for _, plat := range getSupportedPlatforms() {
|
||||||
_, err := fmt.Fprintf(&b, " - %s\n", plat)
|
fmt.Fprintf(&b, " - %s\n", plat)
|
||||||
if err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
initCmd.StringFlag("x",
|
initCmd.StringFlag("x",
|
||||||
fmt.Sprintf("Cross-compile application to specified platform via xgo\n%s", b.String()),
|
fmt.Sprintf("Cross-compile application to specified platform via xgo\n%s", b.String()),
|
||||||
@@ -77,14 +73,13 @@ func init() {
|
|||||||
// Project options
|
// Project options
|
||||||
projectOptions := &cmd.ProjectOptions{}
|
projectOptions := &cmd.ProjectOptions{}
|
||||||
projectOptions.Verbose = verbose
|
projectOptions.Verbose = verbose
|
||||||
projectOptions.UseFirebug = usefirebug
|
|
||||||
|
|
||||||
// Check we are in project directory
|
// Check we are in project directory
|
||||||
// Check project.json loads correctly
|
// Check project.json loads correctly
|
||||||
fs := cmd.NewFSHelper()
|
fs := cmd.NewFSHelper()
|
||||||
err := projectOptions.LoadConfig(fs.Cwd())
|
err := projectOptions.LoadConfig(fs.Cwd())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("unable to find 'project.json'. Please check you are in a Wails project directory")
|
return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set firebug flag
|
// Set firebug flag
|
||||||
@@ -147,6 +142,12 @@ func init() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ensure that runtime init.js is the production version
|
||||||
|
err = cmd.InstallProdRuntime(projectDir, projectOptions)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Move to project directory
|
// Move to project directory
|
||||||
|
|||||||
@@ -27,13 +27,19 @@ func init() {
|
|||||||
logger.PrintSmallBanner(message)
|
logger.PrintSmallBanner(message)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
|
// Check Mewn is installed
|
||||||
|
err := cmd.CheckMewn(verbose)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// Project options
|
// Project options
|
||||||
projectOptions := &cmd.ProjectOptions{}
|
projectOptions := &cmd.ProjectOptions{}
|
||||||
|
|
||||||
// Check we are in project directory
|
// Check we are in project directory
|
||||||
// Check project.json loads correctly
|
// Check project.json loads correctly
|
||||||
fs := cmd.NewFSHelper()
|
fs := cmd.NewFSHelper()
|
||||||
err := projectOptions.LoadConfig(fs.Cwd())
|
err = projectOptions.LoadConfig(fs.Cwd())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
//go:build windows
|
|
||||||
// +build windows
|
// +build windows
|
||||||
|
|
||||||
package cmd
|
package cmd
|
||||||
|
|||||||
81
config.go
81
config.go
@@ -1,9 +1,11 @@
|
|||||||
package wails
|
package wails
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails/runtime"
|
"github.com/wailsapp/wails/runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -31,18 +33,6 @@ type AppConfig struct {
|
|||||||
// Indicates whether your app should be resizable
|
// Indicates whether your app should be resizable
|
||||||
Resizable bool
|
Resizable bool
|
||||||
|
|
||||||
// Minimum width of a resizable window. If set, MinHeight should also be set.
|
|
||||||
MinWidth int
|
|
||||||
|
|
||||||
// Minimum height of a resizable window. If set, MinWidth should also be set.
|
|
||||||
MinHeight int
|
|
||||||
|
|
||||||
// Maximum width of a resizable window. If set, MaxHeight should also be set.
|
|
||||||
MaxWidth int
|
|
||||||
|
|
||||||
// Maximum height of a resizable window. If set, MaxWidth should also be set.
|
|
||||||
MaxHeight int
|
|
||||||
|
|
||||||
// Indicated if the devtools should be disabled
|
// Indicated if the devtools should be disabled
|
||||||
DisableInspector bool
|
DisableInspector bool
|
||||||
}
|
}
|
||||||
@@ -77,26 +67,6 @@ func (a *AppConfig) GetResizable() bool {
|
|||||||
return a.Resizable
|
return a.Resizable
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMinWidth returns the minimum width of the window
|
|
||||||
func (a *AppConfig) GetMinWidth() int {
|
|
||||||
return a.MinWidth
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetMinHeight returns the minimum height of the window
|
|
||||||
func (a *AppConfig) GetMinHeight() int {
|
|
||||||
return a.MinHeight
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetMaxWidth returns the maximum width of the window
|
|
||||||
func (a *AppConfig) GetMaxWidth() int {
|
|
||||||
return a.MaxWidth
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetMaxHeight returns the maximum height of the window
|
|
||||||
func (a *AppConfig) GetMaxHeight() int {
|
|
||||||
return a.MaxHeight
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetDisableInspector returns true if the inspector should be disabled
|
// GetDisableInspector returns true if the inspector should be disabled
|
||||||
func (a *AppConfig) GetDisableInspector() bool {
|
func (a *AppConfig) GetDisableInspector() bool {
|
||||||
return a.DisableInspector
|
return a.DisableInspector
|
||||||
@@ -129,10 +99,6 @@ func (a *AppConfig) merge(in *AppConfig) error {
|
|||||||
a.Colour = in.Colour
|
a.Colour = in.Colour
|
||||||
}
|
}
|
||||||
|
|
||||||
if in.HTML != "" {
|
|
||||||
a.HTML = in.HTML
|
|
||||||
}
|
|
||||||
|
|
||||||
if in.JS != "" {
|
if in.JS != "" {
|
||||||
a.JS = in.JS
|
a.JS = in.JS
|
||||||
}
|
}
|
||||||
@@ -147,23 +113,6 @@ func (a *AppConfig) merge(in *AppConfig) error {
|
|||||||
if in.Height != 0 {
|
if in.Height != 0 {
|
||||||
a.Height = in.Height
|
a.Height = in.Height
|
||||||
}
|
}
|
||||||
|
|
||||||
if in.MinWidth != 0 {
|
|
||||||
a.MinWidth = in.MinWidth
|
|
||||||
}
|
|
||||||
|
|
||||||
if in.MinHeight != 0 {
|
|
||||||
a.MinHeight = in.MinHeight
|
|
||||||
}
|
|
||||||
|
|
||||||
if in.MaxWidth != 0 {
|
|
||||||
a.MaxWidth = in.MaxWidth
|
|
||||||
}
|
|
||||||
|
|
||||||
if in.MaxHeight != 0 {
|
|
||||||
a.MaxHeight = in.MaxHeight
|
|
||||||
}
|
|
||||||
|
|
||||||
a.Resizable = in.Resizable
|
a.Resizable = in.Resizable
|
||||||
a.DisableInspector = in.DisableInspector
|
a.DisableInspector = in.DisableInspector
|
||||||
|
|
||||||
@@ -176,13 +125,9 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
|
|||||||
Width: 800,
|
Width: 800,
|
||||||
Height: 600,
|
Height: 600,
|
||||||
Resizable: true,
|
Resizable: true,
|
||||||
MinWidth: -1,
|
|
||||||
MinHeight: -1,
|
|
||||||
MaxWidth: -1,
|
|
||||||
MaxHeight: -1,
|
|
||||||
Title: "My Wails App",
|
Title: "My Wails App",
|
||||||
Colour: "",
|
Colour: "#FFF", // White by default
|
||||||
HTML: defaultHTML,
|
HTML: mewn.String("./runtime/assets/default.html"),
|
||||||
}
|
}
|
||||||
|
|
||||||
if userConfig != nil {
|
if userConfig != nil {
|
||||||
@@ -192,19 +137,9 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
println("****************************************************")
|
||||||
|
fmt.Printf("%+v\n", result)
|
||||||
|
println("****************************************************")
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var defaultHTML = `<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div id="app"></div>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>`
|
|
||||||
|
|||||||
10
go.mod
10
go.mod
@@ -5,10 +5,11 @@ require (
|
|||||||
github.com/abadojack/whatlanggo v1.0.1
|
github.com/abadojack/whatlanggo v1.0.1
|
||||||
github.com/fatih/color v1.7.0
|
github.com/fatih/color v1.7.0
|
||||||
github.com/go-playground/colors v1.2.0
|
github.com/go-playground/colors v1.2.0
|
||||||
github.com/gorilla/websocket v1.4.1
|
github.com/gorilla/websocket v1.4.0
|
||||||
github.com/jackmordaunt/icns v1.0.0
|
github.com/jackmordaunt/icns v1.0.0
|
||||||
github.com/kennygrant/sanitize v1.2.4
|
github.com/kennygrant/sanitize v1.2.4
|
||||||
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
|
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
|
||||||
|
github.com/leaanthony/mewn v0.10.7
|
||||||
github.com/leaanthony/slicer v1.4.0
|
github.com/leaanthony/slicer v1.4.0
|
||||||
github.com/leaanthony/spinner v0.5.3
|
github.com/leaanthony/spinner v0.5.3
|
||||||
github.com/mattn/go-colorable v0.1.1 // indirect
|
github.com/mattn/go-colorable v0.1.1 // indirect
|
||||||
@@ -16,16 +17,15 @@ require (
|
|||||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
|
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
|
||||||
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
|
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
|
||||||
github.com/pkg/errors v0.8.1 // indirect
|
github.com/pkg/errors v0.8.1 // indirect
|
||||||
github.com/sirupsen/logrus v1.8.1
|
github.com/sirupsen/logrus v1.4.1
|
||||||
github.com/stretchr/objx v0.1.1 // indirect
|
|
||||||
github.com/stretchr/testify v1.3.0 // indirect
|
github.com/stretchr/testify v1.3.0 // indirect
|
||||||
github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
|
github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
|
||||||
golang.org/x/image v0.0.0-20200430140353-33d19683fad8
|
golang.org/x/image v0.0.0-20200430140353-33d19683fad8
|
||||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
|
golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
|
||||||
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
|
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
|
||||||
golang.org/x/text v0.3.0
|
golang.org/x/text v0.3.0
|
||||||
gopkg.in/AlecAivazis/survey.v1 v1.8.4
|
gopkg.in/AlecAivazis/survey.v1 v1.8.4
|
||||||
gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
|
gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
|
||||||
)
|
)
|
||||||
|
|
||||||
go 1.16
|
go 1.13
|
||||||
|
|||||||
15
go.sum
15
go.sum
@@ -11,8 +11,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
|
|||||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||||
github.com/go-playground/colors v1.2.0 h1:0EdjTXKrr2g1L/LQTYtIqabeHpZuGZz1U4osS1T8+5M=
|
github.com/go-playground/colors v1.2.0 h1:0EdjTXKrr2g1L/LQTYtIqabeHpZuGZz1U4osS1T8+5M=
|
||||||
github.com/go-playground/colors v1.2.0/go.mod h1:miw1R2JIE19cclPxsXqNdzLZsk4DP4iF+m88bRc7kfM=
|
github.com/go-playground/colors v1.2.0/go.mod h1:miw1R2JIE19cclPxsXqNdzLZsk4DP4iF+m88bRc7kfM=
|
||||||
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
|
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
|
||||||
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
||||||
github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
|
github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
|
||||||
github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
|
github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
|
||||||
github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmAMQ=
|
github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmAMQ=
|
||||||
@@ -26,6 +26,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3
|
|||||||
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||||
github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
|
github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
|
github.com/leaanthony/mewn v0.10.7 h1:jCcNJyIUOpwj+I5SuATvCugDjHkoo+j6ubEOxxrxmPA=
|
||||||
|
github.com/leaanthony/mewn v0.10.7/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ=
|
||||||
github.com/leaanthony/slicer v1.4.0 h1:Q9u4w+UBU4WHjXnEDdz+eRLMKF/rnyosRBiqULnc1J8=
|
github.com/leaanthony/slicer v1.4.0 h1:Q9u4w+UBU4WHjXnEDdz+eRLMKF/rnyosRBiqULnc1J8=
|
||||||
github.com/leaanthony/slicer v1.4.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
|
github.com/leaanthony/slicer v1.4.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
|
||||||
github.com/leaanthony/spinner v0.5.3 h1:IMTvgdQCec5QA4qRy0wil4XsRP+QcG1OwLWVK/LPZ5Y=
|
github.com/leaanthony/spinner v0.5.3 h1:IMTvgdQCec5QA4qRy0wil4XsRP+QcG1OwLWVK/LPZ5Y=
|
||||||
@@ -54,8 +56,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
|
|||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
|
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
|
||||||
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
||||||
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
|
|
||||||
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||||
@@ -66,6 +66,7 @@ github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba h1:2DHfQOxcpWdGf5
|
|||||||
github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba/go.mod h1:iLnlXG2Pakcii2CU0cbY07DRCSvpWNa7nFxtevhOChk=
|
github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba/go.mod h1:iLnlXG2Pakcii2CU0cbY07DRCSvpWNa7nFxtevhOChk=
|
||||||
golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
|
golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
|
||||||
golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
@@ -78,12 +79,8 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5h
|
|||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
|
||||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
|
|
||||||
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
|
|
||||||
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
gopkg.in/AlecAivazis/survey.v1 v1.8.4 h1:10xXXN3wgIhPheb5NI58zFgZv32Ana7P3Tl4shW+0Qc=
|
gopkg.in/AlecAivazis/survey.v1 v1.8.4 h1:10xXXN3wgIhPheb5NI58zFgZv32Ana7P3Tl4shW+0Qc=
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/wailsapp/wails/lib/logger"
|
"github.com/wailsapp/wails/lib/logger"
|
||||||
)
|
)
|
||||||
@@ -28,10 +27,6 @@ func newBoundFunction(object interface{}) (*boundFunction, error) {
|
|||||||
objectType := reflect.TypeOf(object)
|
objectType := reflect.TypeOf(object)
|
||||||
|
|
||||||
name := runtime.FuncForPC(objectValue.Pointer()).Name()
|
name := runtime.FuncForPC(objectValue.Pointer()).Name()
|
||||||
if strings.Contains(name, "/") {
|
|
||||||
parts := strings.Split(name, "/")
|
|
||||||
name = parts[len(parts)-1]
|
|
||||||
}
|
|
||||||
|
|
||||||
result := &boundFunction{
|
result := &boundFunction{
|
||||||
fullName: name,
|
fullName: name,
|
||||||
|
|||||||
@@ -115,15 +115,15 @@ func (b *Manager) generateTypescriptDefinitions() error {
|
|||||||
|
|
||||||
for structname, methodList := range b.structList {
|
for structname, methodList := range b.structList {
|
||||||
structname = strings.SplitN(structname, ".", 2)[1]
|
structname = strings.SplitN(structname, ".", 2)[1]
|
||||||
output.WriteString(fmt.Sprintf("interface %s {\n", structname))
|
output.WriteString(fmt.Sprintf("Interface %s {\n", structname))
|
||||||
for _, method := range methodList {
|
for _, method := range methodList {
|
||||||
output.WriteString(fmt.Sprintf("\t%s(...args : any[]):Promise<any>\n", method))
|
output.WriteString(fmt.Sprintf("\t%s: (...args : any[]) => Promise\n", method))
|
||||||
}
|
}
|
||||||
output.WriteString("}\n")
|
output.WriteString("}\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
output.WriteString("\n")
|
output.WriteString("\n")
|
||||||
output.WriteString("interface Backend {\n")
|
output.WriteString("Interface Backend {\n")
|
||||||
|
|
||||||
for structname := range b.structList {
|
for structname := range b.structList {
|
||||||
structname = strings.SplitN(structname, ".", 2)[1]
|
structname = strings.SplitN(structname, ".", 2)[1]
|
||||||
@@ -136,8 +136,7 @@ declare global {
|
|||||||
interface Window {
|
interface Window {
|
||||||
backend: Backend;
|
backend: Backend;
|
||||||
}
|
}
|
||||||
}
|
}`
|
||||||
export {};`
|
|
||||||
output.WriteString(globals)
|
output.WriteString(globals)
|
||||||
|
|
||||||
b.log.Info("Written Typescript file: " + typescriptDefinitionFilename)
|
b.log.Info("Written Typescript file: " + typescriptDefinitionFilename)
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ type Manager struct {
|
|||||||
log *logger.CustomLogger
|
log *logger.CustomLogger
|
||||||
renderer interfaces.Renderer // Messages will be dispatched to the frontend
|
renderer interfaces.Renderer // Messages will be dispatched to the frontend
|
||||||
wg sync.WaitGroup
|
wg sync.WaitGroup
|
||||||
mu sync.Mutex
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewManager creates a new event manager with a 100 event buffer
|
// NewManager creates a new event manager with a 100 event buffer
|
||||||
@@ -43,12 +42,12 @@ func (e *Manager) PushEvent(eventData *messages.EventData) {
|
|||||||
// means it does not expire (default).
|
// means it does not expire (default).
|
||||||
type eventListener struct {
|
type eventListener struct {
|
||||||
callback func(...interface{}) // Function to call with emitted event data
|
callback func(...interface{}) // Function to call with emitted event data
|
||||||
counter uint // Expire after counter callbacks. 0 = infinite
|
counter int // Expire after counter callbacks. 0 = infinite
|
||||||
expired bool // Indicates if the listener has expired
|
expired bool // Indicates if the listener has expired
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creates a new event listener from the given callback function
|
// Creates a new event listener from the given callback function
|
||||||
func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter uint) error {
|
func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter int) error {
|
||||||
|
|
||||||
// Sanity check inputs
|
// Sanity check inputs
|
||||||
if callback == nil {
|
if callback == nil {
|
||||||
@@ -76,30 +75,7 @@ func (e *Manager) addEventListener(eventName string, callback func(...interface{
|
|||||||
// On adds a listener for the given event
|
// On adds a listener for the given event
|
||||||
func (e *Manager) On(eventName string, callback func(...interface{})) {
|
func (e *Manager) On(eventName string, callback func(...interface{})) {
|
||||||
// Add a persistent eventListener (counter = 0)
|
// Add a persistent eventListener (counter = 0)
|
||||||
err := e.addEventListener(eventName, callback, 0)
|
e.addEventListener(eventName, callback, 0)
|
||||||
if err != nil {
|
|
||||||
e.log.Error(err.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Once adds a listener for the given event that will auto remove
|
|
||||||
// after one callback
|
|
||||||
func (e *Manager) Once(eventName string, callback func(...interface{})) {
|
|
||||||
// Add a persistent eventListener (counter = 0)
|
|
||||||
err := e.addEventListener(eventName, callback, 1)
|
|
||||||
if err != nil {
|
|
||||||
e.log.Error(err.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// OnMultiple adds a listener for the given event that will trigger
|
|
||||||
// at most <counter> times.
|
|
||||||
func (e *Manager) OnMultiple(eventName string, callback func(...interface{}), counter uint) {
|
|
||||||
// Add a persistent eventListener (counter = 0)
|
|
||||||
err := e.addEventListener(eventName, callback, counter)
|
|
||||||
if err != nil {
|
|
||||||
e.log.Error(err.Error())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Emit broadcasts the given event to the subscribed listeners
|
// Emit broadcasts the given event to the subscribed listeners
|
||||||
@@ -132,24 +108,20 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// Notify renderer
|
// Notify renderer
|
||||||
err := e.renderer.NotifyEvent(event)
|
e.renderer.NotifyEvent(event)
|
||||||
if err != nil {
|
|
||||||
e.log.Error(err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
e.mu.Lock()
|
// Notify Go listeners
|
||||||
|
var listenersToRemove []*eventListener
|
||||||
|
|
||||||
// Iterate listeners
|
// Iterate listeners
|
||||||
for _, listener := range e.listeners[event.Name] {
|
for _, listener := range e.listeners[event.Name] {
|
||||||
|
|
||||||
if !listener.expired {
|
// Call listener, perhaps with data
|
||||||
// Call listener, perhaps with data
|
if event.Data == nil {
|
||||||
if event.Data == nil {
|
go listener.callback()
|
||||||
go listener.callback()
|
} else {
|
||||||
} else {
|
unpacked := event.Data.([]interface{})
|
||||||
unpacked := event.Data.([]interface{})
|
go listener.callback(unpacked...)
|
||||||
go listener.callback(unpacked...)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update listen counter
|
// Update listen counter
|
||||||
@@ -161,8 +133,15 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
e.mu.Unlock()
|
// Remove expired listeners in place
|
||||||
|
if len(listenersToRemove) > 0 {
|
||||||
|
listeners := e.listeners[event.Name][:0]
|
||||||
|
for _, listener := range listeners {
|
||||||
|
if !listener.expired {
|
||||||
|
listeners = append(listeners, listener)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
case <-e.quitChannel:
|
case <-e.quitChannel:
|
||||||
e.running = false
|
e.running = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,6 @@ type AppConfig interface {
|
|||||||
GetWidth() int
|
GetWidth() int
|
||||||
GetHeight() int
|
GetHeight() int
|
||||||
GetTitle() string
|
GetTitle() string
|
||||||
GetMinWidth() int
|
|
||||||
GetMinHeight() int
|
|
||||||
GetMaxWidth() int
|
|
||||||
GetMaxHeight() int
|
|
||||||
GetResizable() bool
|
GetResizable() bool
|
||||||
GetHTML() string
|
GetHTML() string
|
||||||
GetDisableInspector() bool
|
GetDisableInspector() bool
|
||||||
|
|||||||
@@ -6,8 +6,6 @@ import "github.com/wailsapp/wails/lib/messages"
|
|||||||
type EventManager interface {
|
type EventManager interface {
|
||||||
PushEvent(*messages.EventData)
|
PushEvent(*messages.EventData)
|
||||||
Emit(eventName string, optionalData ...interface{})
|
Emit(eventName string, optionalData ...interface{})
|
||||||
OnMultiple(eventName string, callback func(...interface{}), counter uint)
|
|
||||||
Once(eventName string, callback func(...interface{}))
|
|
||||||
On(eventName string, callback func(...interface{}))
|
On(eventName string, callback func(...interface{}))
|
||||||
Start(Renderer)
|
Start(Renderer)
|
||||||
Shutdown()
|
Shutdown()
|
||||||
|
|||||||
@@ -22,10 +22,6 @@ type Renderer interface {
|
|||||||
|
|
||||||
// Window Runtime
|
// Window Runtime
|
||||||
SetColour(string) error
|
SetColour(string) error
|
||||||
|
|
||||||
SetMinSize(width, height int)
|
|
||||||
SetMaxSize(width, height int)
|
|
||||||
|
|
||||||
Fullscreen()
|
Fullscreen()
|
||||||
UnFullscreen()
|
UnFullscreen()
|
||||||
SetTitle(title string)
|
SetTitle(title string)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package interfaces
|
package interfaces
|
||||||
|
|
||||||
// Runtime interface
|
// Runtime interface
|
||||||
type Runtime interface{}
|
type Runtime interface {}
|
||||||
@@ -186,18 +186,6 @@ func (h *Bridge) SetColour(colour string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetMinSize is unsupported for Bridge but required
|
|
||||||
// for the Renderer interface
|
|
||||||
func (h *Bridge) SetMinSize(width, height int) {
|
|
||||||
h.log.Warn("SetMinSize() unsupported in bridge mode")
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetMaxSize is unsupported for Bridge but required
|
|
||||||
// for the Renderer interface
|
|
||||||
func (h *Bridge) SetMaxSize(width, height int) {
|
|
||||||
h.log.Warn("SetMaxSize() unsupported in bridge mode")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fullscreen is unsupported for Bridge but required
|
// Fullscreen is unsupported for Bridge but required
|
||||||
// for the Renderer interface
|
// for the Renderer interface
|
||||||
func (h *Bridge) Fullscreen() {
|
func (h *Bridge) Fullscreen() {
|
||||||
|
|||||||
9
lib/renderer/bridge/renderer-mewn.go
Normal file
9
lib/renderer/bridge/renderer-mewn.go
Normal file
File diff suppressed because one or more lines are too long
@@ -3,9 +3,8 @@ package renderer
|
|||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/wailsapp/wails/runtime"
|
|
||||||
|
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails/lib/interfaces"
|
"github.com/wailsapp/wails/lib/interfaces"
|
||||||
"github.com/wailsapp/wails/lib/logger"
|
"github.com/wailsapp/wails/lib/logger"
|
||||||
)
|
)
|
||||||
@@ -59,7 +58,8 @@ func (s *session) start(firstSession bool) {
|
|||||||
s.log.Infof("Connected to frontend.")
|
s.log.Infof("Connected to frontend.")
|
||||||
go s.writePump()
|
go s.writePump()
|
||||||
|
|
||||||
s.evalJS(runtime.WailsJS, wailsRuntimeMessage)
|
wailsRuntime := mewn.String("../../runtime/assets/wails.js")
|
||||||
|
s.evalJS(wailsRuntime, wailsRuntimeMessage)
|
||||||
|
|
||||||
// Inject bindings
|
// Inject bindings
|
||||||
for _, binding := range s.bindingCache {
|
for _, binding := range s.bindingCache {
|
||||||
|
|||||||
10
lib/renderer/renderer-mewn.go
Normal file
10
lib/renderer/renderer-mewn.go
Normal file
File diff suppressed because one or more lines are too long
@@ -8,9 +8,8 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/wailsapp/wails/runtime"
|
|
||||||
|
|
||||||
"github.com/go-playground/colors"
|
"github.com/go-playground/colors"
|
||||||
|
"github.com/leaanthony/mewn"
|
||||||
"github.com/wailsapp/wails/lib/interfaces"
|
"github.com/wailsapp/wails/lib/interfaces"
|
||||||
"github.com/wailsapp/wails/lib/logger"
|
"github.com/wailsapp/wails/lib/logger"
|
||||||
"github.com/wailsapp/wails/lib/messages"
|
"github.com/wailsapp/wails/lib/messages"
|
||||||
@@ -24,13 +23,12 @@ import (
|
|||||||
var UseFirebug = ""
|
var UseFirebug = ""
|
||||||
|
|
||||||
type WebView struct {
|
type WebView struct {
|
||||||
window wv.WebView // The webview object
|
window wv.WebView // The webview object
|
||||||
ipc interfaces.IPCManager
|
ipc interfaces.IPCManager
|
||||||
log *logger.CustomLogger
|
log *logger.CustomLogger
|
||||||
config interfaces.AppConfig
|
config interfaces.AppConfig
|
||||||
eventManager interfaces.EventManager
|
eventManager interfaces.EventManager
|
||||||
bindingCache []string
|
bindingCache []string
|
||||||
maximumSizeSet bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewWebView returns a new WebView struct
|
// NewWebView returns a new WebView struct
|
||||||
@@ -54,37 +52,10 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
|
|||||||
// Save the config
|
// Save the config
|
||||||
w.config = config
|
w.config = config
|
||||||
|
|
||||||
width := config.GetWidth()
|
|
||||||
height := config.GetHeight()
|
|
||||||
|
|
||||||
// Clamp width and height
|
|
||||||
minWidth, minHeight := config.GetMinWidth(), config.GetMinHeight()
|
|
||||||
maxWidth, maxHeight := config.GetMaxWidth(), config.GetMaxHeight()
|
|
||||||
setMinSize := minWidth != -1 && minHeight != -1
|
|
||||||
setMaxSize := maxWidth != -1 && maxHeight != -1
|
|
||||||
|
|
||||||
if setMinSize {
|
|
||||||
if width < minWidth {
|
|
||||||
width = minWidth
|
|
||||||
}
|
|
||||||
if height < minHeight {
|
|
||||||
height = minHeight
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if setMaxSize {
|
|
||||||
if width > maxWidth {
|
|
||||||
width = maxWidth
|
|
||||||
}
|
|
||||||
if height > maxHeight {
|
|
||||||
height = maxHeight
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the WebView instance
|
// Create the WebView instance
|
||||||
w.window = wv.NewWebview(wv.Settings{
|
w.window = wv.NewWebview(wv.Settings{
|
||||||
Width: width,
|
Width: config.GetWidth(),
|
||||||
Height: height,
|
Height: config.GetHeight(),
|
||||||
Title: config.GetTitle(),
|
Title: config.GetTitle(),
|
||||||
Resizable: config.GetResizable(),
|
Resizable: config.GetResizable(),
|
||||||
URL: config.GetHTML(),
|
URL: config.GetHTML(),
|
||||||
@@ -94,31 +65,12 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
// Set minimum and maximum sizes
|
|
||||||
if setMinSize {
|
|
||||||
w.SetMinSize(minWidth, minHeight)
|
|
||||||
}
|
|
||||||
if setMaxSize {
|
|
||||||
w.SetMaxSize(maxWidth, maxHeight)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set minimum and maximum sizes
|
|
||||||
if setMinSize {
|
|
||||||
w.SetMinSize(minWidth, minHeight)
|
|
||||||
}
|
|
||||||
if setMaxSize {
|
|
||||||
w.SetMaxSize(maxWidth, maxHeight)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SignalManager.OnExit(w.Exit)
|
// SignalManager.OnExit(w.Exit)
|
||||||
|
|
||||||
// Set colour
|
// Set colour
|
||||||
color := config.GetColour()
|
err := w.SetColour(config.GetColour())
|
||||||
if color != "" {
|
if err != nil {
|
||||||
err := w.SetColour(color)
|
return err
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
w.log.Info("Initialised")
|
w.log.Info("Initialised")
|
||||||
@@ -231,8 +183,8 @@ func (w *WebView) Run() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Runtime assets
|
// Runtime assets
|
||||||
w.log.DebugFields("Injecting wails JS runtime", logger.Fields{"js": runtime.WailsJS})
|
wailsRuntime := mewn.String("../../runtime/assets/wails.js")
|
||||||
w.evalJS(runtime.WailsJS)
|
w.evalJS(wailsRuntime)
|
||||||
|
|
||||||
// Ping the wait channel when the wails runtime is loaded
|
// Ping the wait channel when the wails runtime is loaded
|
||||||
w.eventManager.On("wails:loaded", func(...interface{}) {
|
w.eventManager.On("wails:loaded", func(...interface{}) {
|
||||||
@@ -255,9 +207,10 @@ func (w *WebView) Run() error {
|
|||||||
w.injectCSS(w.config.GetCSS())
|
w.injectCSS(w.config.GetCSS())
|
||||||
} else {
|
} else {
|
||||||
// Use default wails css
|
// Use default wails css
|
||||||
|
w.log.Debug("Injecting Default Wails CSS")
|
||||||
|
defaultCSS := mewn.String("../../runtime/assets/wails.css")
|
||||||
|
|
||||||
w.log.Debug("Injecting Default Wails CSS: " + runtime.WailsCSS)
|
w.injectCSS(defaultCSS)
|
||||||
w.injectCSS(runtime.WailsCSS)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Inject user JS
|
// Inject user JS
|
||||||
@@ -303,9 +256,6 @@ func (w *WebView) SelectFile(title string, filter string) string {
|
|||||||
wg.Done()
|
wg.Done()
|
||||||
})
|
})
|
||||||
}()
|
}()
|
||||||
|
|
||||||
defer w.focus() // Ensure the main window is put back into focus afterwards
|
|
||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
@@ -324,9 +274,6 @@ func (w *WebView) SelectDirectory() string {
|
|||||||
wg.Done()
|
wg.Done()
|
||||||
})
|
})
|
||||||
}()
|
}()
|
||||||
|
|
||||||
defer w.focus() // Ensure the main window is put back into focus afterwards
|
|
||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
@@ -345,20 +292,10 @@ func (w *WebView) SelectSaveFile(title string, filter string) string {
|
|||||||
wg.Done()
|
wg.Done()
|
||||||
})
|
})
|
||||||
}()
|
}()
|
||||||
|
|
||||||
defer w.focus() // Ensure the main window is put back into focus afterwards
|
|
||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
// focus puts the main window into focus
|
|
||||||
func (w *WebView) focus() {
|
|
||||||
w.window.Dispatch(func() {
|
|
||||||
w.window.Focus()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// callback sends a callback to the frontend
|
// callback sends a callback to the frontend
|
||||||
func (w *WebView) callback(data string) error {
|
func (w *WebView) callback(data string) error {
|
||||||
callbackCMD := fmt.Sprintf("window.wails._.Callback('%s');", data)
|
callbackCMD := fmt.Sprintf("window.wails._.Callback('%s');", data)
|
||||||
@@ -400,37 +337,11 @@ func (w *WebView) NotifyEvent(event *messages.EventData) error {
|
|||||||
return w.evalJS(message)
|
return w.evalJS(message)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetMinSize sets the minimum size of a resizable window
|
|
||||||
func (w *WebView) SetMinSize(width, height int) {
|
|
||||||
if w.config.GetResizable() == false {
|
|
||||||
w.log.Warn("Cannot call SetMinSize() - App.Resizable = false")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.window.Dispatch(func() {
|
|
||||||
w.window.SetMinSize(width, height)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetMaxSize sets the maximum size of a resizable window
|
|
||||||
func (w *WebView) SetMaxSize(width, height int) {
|
|
||||||
if w.config.GetResizable() == false {
|
|
||||||
w.log.Warn("Cannot call SetMaxSize() - App.Resizable = false")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.maximumSizeSet = true
|
|
||||||
w.window.Dispatch(func() {
|
|
||||||
w.window.SetMaxSize(width, height)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fullscreen makes the main window go fullscreen
|
// Fullscreen makes the main window go fullscreen
|
||||||
func (w *WebView) Fullscreen() {
|
func (w *WebView) Fullscreen() {
|
||||||
if w.config.GetResizable() == false {
|
if w.config.GetResizable() == false {
|
||||||
w.log.Warn("Cannot call Fullscreen() - App.Resizable = false")
|
w.log.Warn("Cannot call Fullscreen() - App.Resizable = false")
|
||||||
return
|
return
|
||||||
} else if w.maximumSizeSet {
|
|
||||||
w.log.Warn("Cannot call Fullscreen() - Maximum size of window set")
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
w.window.Dispatch(func() {
|
w.window.Dispatch(func() {
|
||||||
w.window.SetFullscreen(true)
|
w.window.SetFullscreen(true)
|
||||||
|
|||||||
@@ -65,18 +65,6 @@ static inline void CgoWebViewSetTitle(void *w, char *title) {
|
|||||||
webview_set_title((struct webview *)w, title);
|
webview_set_title((struct webview *)w, title);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void CgoWebViewFocus(void *w) {
|
|
||||||
webview_focus((struct webview *)w);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void CgoWebViewMinSize(void *w, int width, int height) {
|
|
||||||
webview_minsize((struct webview *)w, width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void CgoWebViewMaxSize(void *w, int width, int height) {
|
|
||||||
webview_maxsize((struct webview *)w, width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void CgoWebViewSetFullscreen(void *w, int fullscreen) {
|
static inline void CgoWebViewSetFullscreen(void *w, int fullscreen) {
|
||||||
webview_set_fullscreen((struct webview *)w, fullscreen);
|
webview_set_fullscreen((struct webview *)w, fullscreen);
|
||||||
}
|
}
|
||||||
@@ -182,16 +170,6 @@ type WebView interface {
|
|||||||
// SetTitle() changes window title. This method must be called from the main
|
// SetTitle() changes window title. This method must be called from the main
|
||||||
// thread only. See Dispatch() for more details.
|
// thread only. See Dispatch() for more details.
|
||||||
SetTitle(title string)
|
SetTitle(title string)
|
||||||
|
|
||||||
// Focus() puts the main window into focus
|
|
||||||
Focus()
|
|
||||||
|
|
||||||
// SetMinSize() sets the minimum size of the window
|
|
||||||
SetMinSize(width, height int)
|
|
||||||
|
|
||||||
// SetMaxSize() sets the maximum size of the window
|
|
||||||
SetMaxSize(width, height int)
|
|
||||||
|
|
||||||
// SetFullscreen() controls window full-screen mode. This method must be
|
// SetFullscreen() controls window full-screen mode. This method must be
|
||||||
// called from the main thread only. See Dispatch() for more details.
|
// called from the main thread only. See Dispatch() for more details.
|
||||||
SetFullscreen(fullscreen bool)
|
SetFullscreen(fullscreen bool)
|
||||||
@@ -329,18 +307,6 @@ func (w *webview) SetColor(r, g, b, a uint8) {
|
|||||||
C.CgoWebViewSetColor(w.w, C.uint8_t(r), C.uint8_t(g), C.uint8_t(b), C.uint8_t(a))
|
C.CgoWebViewSetColor(w.w, C.uint8_t(r), C.uint8_t(g), C.uint8_t(b), C.uint8_t(a))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *webview) Focus() {
|
|
||||||
C.CgoWebViewFocus(w.w)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *webview) SetMinSize(width, height int) {
|
|
||||||
C.CgoWebViewMinSize(w.w, C.int(width), C.int(height))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *webview) SetMaxSize(width, height int) {
|
|
||||||
C.CgoWebViewMaxSize(w.w, C.int(width), C.int(height))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *webview) SetFullscreen(fullscreen bool) {
|
func (w *webview) SetFullscreen(fullscreen bool) {
|
||||||
C.CgoWebViewSetFullscreen(w.w, C.int(boolToInt(fullscreen)))
|
C.CgoWebViewSetFullscreen(w.w, C.int(boolToInt(fullscreen)))
|
||||||
}
|
}
|
||||||
@@ -387,9 +353,7 @@ func _webviewDispatchGoCallback(index unsafe.Pointer) {
|
|||||||
f = fns[uintptr(index)]
|
f = fns[uintptr(index)]
|
||||||
delete(fns, uintptr(index))
|
delete(fns, uintptr(index))
|
||||||
m.Unlock()
|
m.Unlock()
|
||||||
if f != nil {
|
f()
|
||||||
f()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//export _webviewExternalInvokeCallback
|
//export _webviewExternalInvokeCallback
|
||||||
@@ -405,7 +369,5 @@ func _webviewExternalInvokeCallback(w unsafe.Pointer, data unsafe.Pointer) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
m.Unlock()
|
m.Unlock()
|
||||||
if cb != nil {
|
cb(wv, C.GoString((*C.char)(data)))
|
||||||
cb(wv, C.GoString((*C.char)(data)))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,11 +54,6 @@ extern "C"
|
|||||||
int ready;
|
int ready;
|
||||||
int js_busy;
|
int js_busy;
|
||||||
int should_exit;
|
int should_exit;
|
||||||
|
|
||||||
int min_width;
|
|
||||||
int min_height;
|
|
||||||
int max_width;
|
|
||||||
int max_height;
|
|
||||||
};
|
};
|
||||||
#elif defined(WEBVIEW_WINAPI)
|
#elif defined(WEBVIEW_WINAPI)
|
||||||
#define CINTERFACE
|
#define CINTERFACE
|
||||||
@@ -80,11 +75,6 @@ struct webview_priv
|
|||||||
DWORD saved_style;
|
DWORD saved_style;
|
||||||
DWORD saved_ex_style;
|
DWORD saved_ex_style;
|
||||||
RECT saved_rect;
|
RECT saved_rect;
|
||||||
|
|
||||||
int min_width;
|
|
||||||
int min_height;
|
|
||||||
int max_width;
|
|
||||||
int max_height;
|
|
||||||
};
|
};
|
||||||
#elif defined(WEBVIEW_COCOA)
|
#elif defined(WEBVIEW_COCOA)
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
@@ -178,9 +168,6 @@ struct webview_priv
|
|||||||
WEBVIEW_API int webview_eval(struct webview *w, const char *js);
|
WEBVIEW_API int webview_eval(struct webview *w, const char *js);
|
||||||
WEBVIEW_API int webview_inject_css(struct webview *w, const char *css);
|
WEBVIEW_API int webview_inject_css(struct webview *w, const char *css);
|
||||||
WEBVIEW_API void webview_set_title(struct webview *w, const char *title);
|
WEBVIEW_API void webview_set_title(struct webview *w, const char *title);
|
||||||
WEBVIEW_API void webview_focus(struct webview *w);
|
|
||||||
WEBVIEW_API void webview_minsize(struct webview *w, int width, int height);
|
|
||||||
WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height);
|
|
||||||
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen);
|
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen);
|
||||||
WEBVIEW_API void webview_set_color(struct webview *w, uint8_t r, uint8_t g,
|
WEBVIEW_API void webview_set_color(struct webview *w, uint8_t r, uint8_t g,
|
||||||
uint8_t b, uint8_t a);
|
uint8_t b, uint8_t a);
|
||||||
@@ -342,12 +329,6 @@ struct webview_priv
|
|||||||
w->priv.should_exit = 0;
|
w->priv.should_exit = 0;
|
||||||
w->priv.queue = g_async_queue_new();
|
w->priv.queue = g_async_queue_new();
|
||||||
w->priv.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
w->priv.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||||
|
|
||||||
w->priv.min_width = -1;
|
|
||||||
w->priv.min_height = -1;
|
|
||||||
w->priv.max_width = -1;
|
|
||||||
w->priv.max_height = -1;
|
|
||||||
|
|
||||||
gtk_window_set_title(GTK_WINDOW(w->priv.window), w->title);
|
gtk_window_set_title(GTK_WINDOW(w->priv.window), w->title);
|
||||||
|
|
||||||
if (w->resizable)
|
if (w->resizable)
|
||||||
@@ -383,7 +364,6 @@ struct webview_priv
|
|||||||
webkit_web_view_get_settings(WEBKIT_WEB_VIEW(w->priv.webview));
|
webkit_web_view_get_settings(WEBKIT_WEB_VIEW(w->priv.webview));
|
||||||
webkit_settings_set_enable_write_console_messages_to_stdout(settings, true);
|
webkit_settings_set_enable_write_console_messages_to_stdout(settings, true);
|
||||||
webkit_settings_set_enable_developer_extras(settings, true);
|
webkit_settings_set_enable_developer_extras(settings, true);
|
||||||
webkit_settings_set_hardware_acceleration_policy(settings, WEBKIT_HARDWARE_ACCELERATION_POLICY_ALWAYS);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -415,49 +395,6 @@ struct webview_priv
|
|||||||
gtk_window_set_title(GTK_WINDOW(w->priv.window), title);
|
gtk_window_set_title(GTK_WINDOW(w->priv.window), title);
|
||||||
}
|
}
|
||||||
|
|
||||||
WEBVIEW_API void webview_focus(struct webview *w)
|
|
||||||
{
|
|
||||||
gtk_window_present(GTK_WINDOW(w->priv.window));
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
|
|
||||||
|
|
||||||
w->priv.min_width = width;
|
|
||||||
w->priv.min_height = height;
|
|
||||||
|
|
||||||
GdkGeometry hints;
|
|
||||||
GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MIN_SIZE;
|
|
||||||
|
|
||||||
hints.min_width = w->priv.min_width;
|
|
||||||
hints.min_height = w->priv.min_height;
|
|
||||||
if (w->priv.max_width != -1) {
|
|
||||||
hints.max_width = w->priv.max_width;
|
|
||||||
hints.max_height = w->priv.max_height;
|
|
||||||
usedHints = (GdkWindowHints)(GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
|
|
||||||
|
|
||||||
w->priv.max_width = width;
|
|
||||||
w->priv.max_height = height;
|
|
||||||
|
|
||||||
GdkGeometry hints;
|
|
||||||
GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MAX_SIZE;
|
|
||||||
|
|
||||||
if (w->priv.min_width != -1) {
|
|
||||||
hints.min_width = w->priv.min_width;
|
|
||||||
hints.min_height = w->priv.min_height;
|
|
||||||
usedHints = (GdkWindowHints)(GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
|
|
||||||
}
|
|
||||||
hints.max_width = w->priv.max_width;
|
|
||||||
hints.max_height = w->priv.max_height;
|
|
||||||
|
|
||||||
gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
|
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
|
||||||
{
|
{
|
||||||
if (fullscreen)
|
if (fullscreen)
|
||||||
@@ -514,6 +451,7 @@ struct webview_priv
|
|||||||
}
|
}
|
||||||
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE);
|
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE);
|
||||||
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE);
|
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE);
|
||||||
|
gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dlg), TRUE);
|
||||||
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dlg), TRUE);
|
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dlg), TRUE);
|
||||||
gtk_file_chooser_set_create_folders(GTK_FILE_CHOOSER(dlg), TRUE);
|
gtk_file_chooser_set_create_folders(GTK_FILE_CHOOSER(dlg), TRUE);
|
||||||
gint response = gtk_dialog_run(GTK_DIALOG(dlg));
|
gint response = gtk_dialog_run(GTK_DIALOG(dlg));
|
||||||
@@ -1392,39 +1330,7 @@ struct webview_priv
|
|||||||
case WM_CREATE:
|
case WM_CREATE:
|
||||||
w = (struct webview *)((CREATESTRUCT *)lParam)->lpCreateParams;
|
w = (struct webview *)((CREATESTRUCT *)lParam)->lpCreateParams;
|
||||||
w->priv.hwnd = hwnd;
|
w->priv.hwnd = hwnd;
|
||||||
|
|
||||||
return EmbedBrowserObject(w);
|
return EmbedBrowserObject(w);
|
||||||
case WM_GETMINMAXINFO:
|
|
||||||
{
|
|
||||||
if (w != NULL) {
|
|
||||||
// get pixel density
|
|
||||||
HDC hDC = GetDC(NULL);
|
|
||||||
double DPIScaleX = GetDeviceCaps(hDC, 88)/96.0;
|
|
||||||
double DPIScaleY = GetDeviceCaps(hDC, 90)/96.0;
|
|
||||||
ReleaseDC(NULL, hDC);
|
|
||||||
|
|
||||||
RECT rcClient, rcWind;
|
|
||||||
POINT ptDiff;
|
|
||||||
GetClientRect(hwnd, &rcClient);
|
|
||||||
GetWindowRect(hwnd, &rcWind);
|
|
||||||
|
|
||||||
int widthExtra = (rcWind.right - rcWind.left) - rcClient.right;
|
|
||||||
int heightExtra = (rcWind.bottom - rcWind.top) - rcClient.bottom;
|
|
||||||
|
|
||||||
LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam;
|
|
||||||
|
|
||||||
if (w->priv.min_width != -1) {
|
|
||||||
lpMMI->ptMinTrackSize.x = w->priv.min_width * DPIScaleX + widthExtra;
|
|
||||||
lpMMI->ptMinTrackSize.y = w->priv.min_height * DPIScaleY + heightExtra;
|
|
||||||
}
|
|
||||||
if (w->priv.max_width != -1) {
|
|
||||||
lpMMI->ptMaxTrackSize.x = w->priv.max_width * DPIScaleX + widthExtra;
|
|
||||||
lpMMI->ptMaxTrackSize.y = w->priv.max_height * DPIScaleY + heightExtra;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
case WM_DESTROY:
|
case WM_DESTROY:
|
||||||
UnEmbedBrowserObject(w);
|
UnEmbedBrowserObject(w);
|
||||||
PostQuitMessage(0);
|
PostQuitMessage(0);
|
||||||
@@ -1489,9 +1395,6 @@ struct webview_priv
|
|||||||
|
|
||||||
WEBVIEW_API int webview_init(struct webview *w)
|
WEBVIEW_API int webview_init(struct webview *w)
|
||||||
{
|
{
|
||||||
w->priv.min_width = -1;
|
|
||||||
w->priv.max_width = -1;
|
|
||||||
|
|
||||||
WNDCLASSEX wc;
|
WNDCLASSEX wc;
|
||||||
HINSTANCE hInstance;
|
HINSTANCE hInstance;
|
||||||
DWORD style;
|
DWORD style;
|
||||||
@@ -1737,21 +1640,6 @@ struct webview_priv
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
WEBVIEW_API void webview_focus(struct webview *w)
|
|
||||||
{
|
|
||||||
SetFocus(w->priv.hwnd);
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
|
|
||||||
w->priv.min_width = width;
|
|
||||||
w->priv.min_height = height;
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
|
|
||||||
w->priv.max_width = width;
|
|
||||||
w->priv.max_height = height;
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
|
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
|
||||||
{
|
{
|
||||||
if (w->priv.is_fullscreen == !!fullscreen)
|
if (w->priv.is_fullscreen == !!fullscreen)
|
||||||
@@ -2154,10 +2042,6 @@ struct webview_priv
|
|||||||
objc_setAssociatedObject(w->priv.delegate, "webview", (id)(w),
|
objc_setAssociatedObject(w->priv.delegate, "webview", (id)(w),
|
||||||
OBJC_ASSOCIATION_ASSIGN);
|
OBJC_ASSOCIATION_ASSIGN);
|
||||||
|
|
||||||
// Disable damn smart quotes
|
|
||||||
// Credit: https://stackoverflow.com/a/31640511
|
|
||||||
[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSAutomaticQuoteSubstitutionEnabled"];
|
|
||||||
|
|
||||||
NSRect r = NSMakeRect(0, 0, w->width, w->height);
|
NSRect r = NSMakeRect(0, 0, w->width, w->height);
|
||||||
NSUInteger style = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
|
NSUInteger style = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
|
||||||
NSWindowStyleMaskMiniaturizable;
|
NSWindowStyleMaskMiniaturizable;
|
||||||
@@ -2323,29 +2207,6 @@ struct webview_priv
|
|||||||
[w->priv.window setTitle:nsTitle];
|
[w->priv.window setTitle:nsTitle];
|
||||||
}
|
}
|
||||||
|
|
||||||
WEBVIEW_API void webview_focus(struct webview *w)
|
|
||||||
{
|
|
||||||
[w->priv.window makeKeyWindow];
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
|
|
||||||
NSSize size;
|
|
||||||
size.width = width;
|
|
||||||
size.height = height;
|
|
||||||
[w->priv.window setMinSize:size];
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
|
|
||||||
NSSize size;
|
|
||||||
size.width = width;
|
|
||||||
size.height = height;
|
|
||||||
[w->priv.window setMaxSize:size];
|
|
||||||
|
|
||||||
NSButton *button = [w->priv.window standardWindowButton:NSWindowZoomButton];
|
|
||||||
[button performSelectorOnMainThread:@selector(setEnabled:) withObject:NO
|
|
||||||
waitUntilDone:NO];
|
|
||||||
}
|
|
||||||
|
|
||||||
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
|
WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
|
||||||
{
|
{
|
||||||
int b = ((([w->priv.window styleMask] & NSWindowStyleMaskFullScreen) ==
|
int b = ((([w->priv.window styleMask] & NSWindowStyleMaskFullScreen) ==
|
||||||
@@ -2430,8 +2291,6 @@ struct webview_priv
|
|||||||
[panel setAllowedFileTypes:fileTypes];
|
[panel setAllowedFileTypes:fileTypes];
|
||||||
}
|
}
|
||||||
[panel setTreatsFilePackagesAsDirectories:YES];
|
[panel setTreatsFilePackagesAsDirectories:YES];
|
||||||
[panel setNameFieldStringValue:@"Temp"]; // Necessary to prevent crash when replacing files
|
|
||||||
[panel setNameFieldStringValue:@"Untitled"];
|
|
||||||
[panel beginSheetModalForWindow:w->priv.window
|
[panel beginSheetModalForWindow:w->priv.window
|
||||||
completionHandler:^(NSInteger result) {
|
completionHandler:^(NSInteger result) {
|
||||||
[NSApp stopModalWithCode:result];
|
[NSApp stopModalWithCode:result];
|
||||||
|
|||||||
BIN
logo_cropped.png
BIN
logo_cropped.png
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 122 KiB |
3
package-lock.json
generated
3
package-lock.json
generated
@@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"lockfileVersion": 1
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package runtime
|
|
||||||
|
|
||||||
import _ "embed"
|
|
||||||
|
|
||||||
//go:embed assets/bridge.js
|
|
||||||
var BridgeJS []byte
|
|
||||||
|
|
||||||
//go:embed assets/wails.js
|
|
||||||
var WailsJS string
|
|
||||||
|
|
||||||
//go:embed assets/wails.css
|
|
||||||
var WailsCSS string
|
|
||||||
|
|
||||||
//go:embed js/runtime/init.js
|
|
||||||
var InitJS []byte
|
|
||||||
18
runtime/assets/default.html
Normal file
18
runtime/assets/default.html
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div id="app"></div>
|
||||||
|
<script type="text/javascript">function AddScript(js, callbackID) {
|
||||||
|
var script = document.createElement('script');
|
||||||
|
script.text = js;
|
||||||
|
document.body.appendChild(script);
|
||||||
|
}</script>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
File diff suppressed because one or more lines are too long
@@ -19,16 +19,6 @@ func (r *Events) On(eventName string, callback func(optionalData ...interface{})
|
|||||||
r.eventManager.On(eventName, callback)
|
r.eventManager.On(eventName, callback)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Once pass through
|
|
||||||
func (r *Events) Once(eventName string, callback func(optionalData ...interface{})) {
|
|
||||||
r.eventManager.Once(eventName, callback)
|
|
||||||
}
|
|
||||||
|
|
||||||
// OnMultiple pass through
|
|
||||||
func (r *Events) OnMultiple(eventName string, callback func(optionalData ...interface{}), counter uint) {
|
|
||||||
r.eventManager.OnMultiple(eventName, callback, counter)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit pass through
|
// Emit pass through
|
||||||
func (r *Events) Emit(eventName string, optionalData ...interface{}) {
|
func (r *Events) Emit(eventName string, optionalData ...interface{}) {
|
||||||
r.eventManager.Emit(eventName, optionalData...)
|
r.eventManager.Emit(eventName, optionalData...)
|
||||||
|
|||||||
@@ -3,12 +3,12 @@
|
|||||||
"browser": true,
|
"browser": true,
|
||||||
"es6": true,
|
"es6": true,
|
||||||
"amd": true,
|
"amd": true,
|
||||||
"node": true
|
"node": true,
|
||||||
},
|
},
|
||||||
"extends": "eslint:recommended",
|
"extends": "eslint:recommended",
|
||||||
"parserOptions": {
|
"parserOptions": {
|
||||||
"ecmaVersion": 2016,
|
"ecmaVersion": 2016,
|
||||||
"sourceType": "module"
|
"sourceType": "module",
|
||||||
},
|
},
|
||||||
"rules": {
|
"rules": {
|
||||||
"indent": [
|
"indent": [
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export function OpenURL(url) {
|
|||||||
* Opens the given filename using the system's default file handler
|
* Opens the given filename using the system's default file handler
|
||||||
*
|
*
|
||||||
* @export
|
* @export
|
||||||
* @param {string} filename
|
* @param {sting} filename
|
||||||
* @returns
|
* @returns
|
||||||
*/
|
*/
|
||||||
export function OpenFile(filename) {
|
export function OpenFile(filename) {
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ if (window.crypto) {
|
|||||||
export function Call(bindingName, data, timeout) {
|
export function Call(bindingName, data, timeout) {
|
||||||
|
|
||||||
// Timeout infinite by default
|
// Timeout infinite by default
|
||||||
if (timeout == null) {
|
if (timeout == null || timeout == undefined) {
|
||||||
timeout = 0;
|
timeout = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ function Invoke(message) {
|
|||||||
*
|
*
|
||||||
* @export
|
* @export
|
||||||
* @param {string} type
|
* @param {string} type
|
||||||
* @param {Object} payload
|
* @param {string} payload
|
||||||
* @param {string=} callbackID
|
* @param {string=} callbackID
|
||||||
*/
|
*/
|
||||||
export function SendMessage(type, payload, callbackID) {
|
export function SendMessage(type, payload, callbackID) {
|
||||||
|
|||||||
@@ -10,31 +10,17 @@ The lightweight framework for web-like apps
|
|||||||
/* jshint esversion: 6 */
|
/* jshint esversion: 6 */
|
||||||
import * as Log from './log';
|
import * as Log from './log';
|
||||||
import * as Browser from './browser';
|
import * as Browser from './browser';
|
||||||
import {Acknowledge, Emit, Heartbeat, Notify, On, OnMultiple} from './events';
|
import { On, OnMultiple, Emit, Notify, Heartbeat, Acknowledge } from './events';
|
||||||
import {NewBinding} from './bindings';
|
import { NewBinding } from './bindings';
|
||||||
import {Callback} from './calls';
|
import { Callback } from './calls';
|
||||||
import {AddScript, InjectCSS, InjectFirebug} from './utils';
|
import { AddScript, InjectCSS, InjectFirebug } from './utils';
|
||||||
import {AddIPCListener} from './ipc';
|
import { AddIPCListener } from './ipc';
|
||||||
import * as Store from './store';
|
import * as Store from './store';
|
||||||
|
|
||||||
// Initialise global if not already
|
// Initialise global if not already
|
||||||
window.wails = window.wails || {};
|
window.wails = window.wails || {};
|
||||||
window.backend = {};
|
window.backend = {};
|
||||||
|
|
||||||
// On webkit2gtk >= 2.32, the external object is not passed to the window context.
|
|
||||||
// However, IE will throw a strict mode error if window.external is assigned to
|
|
||||||
// so we need to make sure that line of code isn't reached in IE
|
|
||||||
|
|
||||||
// Using !window.external transpiles to `window.external = window.external || ...`
|
|
||||||
// so we have to use an explicit if statement to prevent webpack from optimizing the code.
|
|
||||||
if (window.external == undefined) {
|
|
||||||
window.external = {
|
|
||||||
invoke: function (x) {
|
|
||||||
window.webkit.messageHandlers.external.postMessage(x);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Setup internal calls
|
// Setup internal calls
|
||||||
var internal = {
|
var internal = {
|
||||||
NewBinding,
|
NewBinding,
|
||||||
@@ -75,7 +61,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Use firebug?
|
// Use firebug?
|
||||||
if (window.usefirebug) {
|
if( window.usefirebug ) {
|
||||||
InjectFirebug();
|
InjectFirebug();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
50
runtime/js/package-lock.json
generated
50
runtime/js/package-lock.json
generated
@@ -2681,18 +2681,26 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"elliptic": {
|
"elliptic": {
|
||||||
"version": "6.5.4",
|
"version": "6.5.3",
|
||||||
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
|
||||||
"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
|
"integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"bn.js": "^4.11.9",
|
"bn.js": "^4.4.0",
|
||||||
"brorand": "^1.1.0",
|
"brorand": "^1.0.1",
|
||||||
"hash.js": "^1.0.0",
|
"hash.js": "^1.0.0",
|
||||||
"hmac-drbg": "^1.0.1",
|
"hmac-drbg": "^1.0.0",
|
||||||
"inherits": "^2.0.4",
|
"inherits": "^2.0.1",
|
||||||
"minimalistic-assert": "^1.0.1",
|
"minimalistic-assert": "^1.0.0",
|
||||||
"minimalistic-crypto-utils": "^1.0.1"
|
"minimalistic-crypto-utils": "^1.0.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"bn.js": {
|
||||||
|
"version": "4.11.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
|
||||||
|
"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
|
||||||
|
"dev": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"emoji-regex": {
|
"emoji-regex": {
|
||||||
@@ -3951,9 +3959,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"ini": {
|
"ini": {
|
||||||
"version": "1.3.8",
|
"version": "1.3.5",
|
||||||
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
|
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
|
||||||
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
|
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"interpret": {
|
"interpret": {
|
||||||
@@ -4255,9 +4263,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lodash": {
|
"lodash": {
|
||||||
"version": "4.17.21",
|
"version": "4.17.20",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
|
||||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"loose-envify": {
|
"loose-envify": {
|
||||||
@@ -5525,9 +5533,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"ssri": {
|
"ssri": {
|
||||||
"version": "6.0.2",
|
"version": "6.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
|
||||||
"integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
|
"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"figgy-pudding": "^3.5.1"
|
"figgy-pudding": "^3.5.1"
|
||||||
@@ -6582,9 +6590,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"y18n": {
|
"y18n": {
|
||||||
"version": "4.0.1",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
|
||||||
"integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
|
"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"yallist": {
|
"yallist": {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
index.js
|
bridge.js
|
||||||
26
runtime/js/runtime/package-lock.json
generated
26
runtime/js/runtime/package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@wailsapp/runtime",
|
"name": "@wailsapp/runtime",
|
||||||
"version": "1.1.1",
|
"version": "1.1.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -124,15 +124,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hosted-git-info": {
|
"hosted-git-info": {
|
||||||
"version": "2.8.9",
|
"version": "2.8.8",
|
||||||
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
|
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
|
||||||
"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
|
"integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"ini": {
|
"ini": {
|
||||||
"version": "1.3.8",
|
"version": "1.3.5",
|
||||||
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
|
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
|
||||||
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
|
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"invert-kv": {
|
"invert-kv": {
|
||||||
@@ -260,9 +260,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"path-parse": {
|
"path-parse": {
|
||||||
"version": "1.0.7",
|
"version": "1.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
|
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
|
||||||
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
|
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"path-type": {
|
"path-type": {
|
||||||
@@ -451,9 +451,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"y18n": {
|
"y18n": {
|
||||||
"version": "3.2.2",
|
"version": "3.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
|
||||||
"integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
|
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"yargs": {
|
"yargs": {
|
||||||
|
|||||||
@@ -67,16 +67,6 @@ func (r *Window) SetColour(colour string) error {
|
|||||||
return r.renderer.SetColour(colour)
|
return r.renderer.SetColour(colour)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetMinSize sets the minimum size of a resizable window
|
|
||||||
func (r *Window) SetMinSize(width, height int) {
|
|
||||||
r.renderer.SetMinSize(width, height)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetMaxSize sets the maximum size of a resizable window
|
|
||||||
func (r *Window) SetMaxSize(width, height int) {
|
|
||||||
r.renderer.SetMaxSize(width, height)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fullscreen makes the window fullscreen
|
// Fullscreen makes the window fullscreen
|
||||||
func (r *Window) Fullscreen() {
|
func (r *Window) Fullscreen() {
|
||||||
r.renderer.Fullscreen()
|
r.renderer.Fullscreen()
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user