v1.0.2-pre3

* feat: new distros: manjaroARM & Deepin

CONTRIBUTORS.md

@@ -2,20 +2,24 @@
 
 Wails is what it is because of the time and effort given by these great people. A huge thank you to each and every one!
 
-* [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot)
-* [Qais Patankar](https://github.com/qaisjp)
-* [Anthony Lee](https://github.com/alee792)
-* [Adrian Lanzafame](https://github.com/lanzafame)
-* [Mattn](https://github.com/mattn)
-* [0xflotus](https://github.com/0xflotus)
-* [Michael D Henderson](https://github.com/mdhender)
-* [fred2104](https://github.com/fishfishfish2104)
-* [intelwalk](https://github.com/intelwalk)
-* [Mark Stenglein](https://github.com/ocelotsloth)
-* [admin_3.exe](https://github.com/bh90210)
-* [iceleo-com](https://github.com/iceleo-com)
-* [fallendusk](https://github.com/fallendusk)
-* [Florian Didran](https://github.com/fdidron)
-* [Nikolai Zimmermann](https://github.com/Chronophylos)
-* [Toyam Cox](https://github.com/Vaelatern)
-* [Robin Eklind](https://github.com/mewmew)
+  * [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot)
+  * [Qais Patankar](https://github.com/qaisjp)
+  * [Anthony Lee](https://github.com/alee792)
+  * [Adrian Lanzafame](https://github.com/lanzafame)
+  * [Mattn](https://github.com/mattn)
+  * [0xflotus](https://github.com/0xflotus)
+  * [Michael D Henderson](https://github.com/mdhender)
+  * [fred2104](https://github.com/fishfishfish2104)
+  * [intelwalk](https://github.com/intelwalk)
+  * [Mark Stenglein](https://github.com/ocelotsloth)
+  * [admin_3.exe](https://github.com/bh90210)
+  * [iceleo-com](https://github.com/iceleo-com)
+  * [fallendusk](https://github.com/fallendusk)
+  * [Florian Didran](https://github.com/fdidron)
+  * [Nikolai Zimmermann](https://github.com/Chronophylos)
+  * [Toyam Cox](https://github.com/Vaelatern)
+  * [Robin Eklind](https://github.com/mewmew)
+  * [Kris Raney](https://github.com/kraney)
+  * [Jack Mordaunt](https://github.com/JackMordaunt)
+  * [Michael Hipp](https://github.com/MichaelHipp)
+  * [Travis McLane](https://github.com/tmclane)

README.md

@@ -1,5 +1,5 @@
 <p align="center" style="text-align: center">
-   <img src="https://github.com/wailsapp/docs/raw/master/.vuepress/public/media/logo_cropped.png" width="40%"><br/>
+   <img src="logo_cropped.png" width="40%"><br/>
 </p>
 <p align="center">
    A framework for building desktop applications using Go & Web Technologies.<br/><br/>
@@ -16,6 +16,8 @@
 
 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).
+
 ## Features
 
 - Use standard Go libraries/frameworks for the backend
@@ -28,9 +30,6 @@ The traditional method of providing web interfaces to Go programs is via a built
 - Powerful cli tool
 - Multiplatform
 
-## Project Status
-
-Wails is currently in Beta. Please make sure you read the [Project Status](https://wails.app/project_status.html) if you are interested in using this project.
 
 ## Installation
 
@@ -94,7 +93,7 @@ Windows requires gcc and related tooling. The recommended download is from [http
 Installation is as simple as running the following command:
 
 <pre style='color:white'>
-go get github.com/wailsapp/wails/cmd/wails
+go get -u github.com/wailsapp/wails/cmd/wails
 </pre>
 
 ## Next Steps
@@ -126,8 +125,7 @@ And without [these people](CONTRIBUTORS.md), it wouldn't be what it is today. A
 
 Special Mentions:
 
-  * [Bill Kennedy](https://twitter.com/goinggodotnet) - Go guru, encourager and all-round nice guy, whose infectious energy and inspiration powered me on when I had none left.
-  * [Mark Bates](https://github.com/markbates) - Creator of [Packr](https://github.com/gobuffalo/packr), inspiration for packing strategies which fed into some of the tooling.
+  * [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:
 

app.go

@@ -1,6 +1,11 @@
 package wails
 
 import (
+	"os"
+	"runtime"
+	"syscall"
+
+	"github.com/syossan27/tebata"
 	"github.com/wailsapp/wails/cmd"
 	"github.com/wailsapp/wails/lib/binding"
 	"github.com/wailsapp/wails/lib/event"
@@ -39,7 +44,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	}
 
 	result := &App{
-		logLevel:       "info",
+		logLevel:       "debug",
 		renderer:       renderer.NewWebView(),
 		ipc:            ipc.NewManager(),
 		bindingManager: binding.NewManager(),
@@ -61,11 +66,15 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 		result.config.DisableInspector = true
 	}
 
+	// Platform specific init
+	platformInit()
+
 	return result
 }
 
 // Run the app
 func (a *App) Run() error {
+
 	if BuildMode != cmd.BuildModeProd {
 		return a.cli.Run()
 	}
@@ -97,6 +106,18 @@ func (a *App) start() error {
 		return err
 	}
 
+	// Enable console for Windows debug builds
+	if runtime.GOOS == "windows" && BuildMode == cmd.BuildModeDebug {
+		a.renderer.EnableConsole()
+	}
+
+	// Start signal handler
+	t := tebata.New(os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
+	t.Reserve(func() {
+		a.log.Debug("SIGNAL CAUGHT! Starting Shutdown")
+		a.renderer.Close()
+	})
+
 	// Start event manager and give it our renderer
 	a.eventManager.Start(a.renderer)
 
@@ -112,8 +133,33 @@ func (a *App) start() error {
 		return err
 	}
 
+	// Defer the shutdown
+	defer a.shutdown()
+
 	// Run the renderer
-	return a.renderer.Run()
+	err = a.renderer.Run()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// shutdown the app
+func (a *App) shutdown() {
+	// Make sure this is only called once
+	a.log.Debug("Shutting down")
+
+	// Shutdown Binding Manager
+	a.bindingManager.Shutdown()
+
+	// Shutdown IPC Manager
+	a.ipc.Shutdown()
+
+	// Shutdown Event Manager
+	a.eventManager.Shutdown()
+
+	a.log.Debug("Cleanly Shutdown")
 }
 
 // Bind allows the user to bind the given object

app_other.go

@@ -0,0 +1,7 @@
+// +build +linux +darwin !windows
+
+package wails
+
+func platformInit() {
+
+}

app_windows.go

@@ -0,0 +1,27 @@
+// +build windows !linux !darwin
+
+package wails
+
+import (
+	"fmt"
+	"log"
+	"syscall"
+)
+
+func platformInit() {
+	err := SetProcessDPIAware()
+	if err != nil {
+		log.Fatalf(err.Error())
+	}
+}
+
+// SetProcessDPIAware via user32.dll
+// https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setprocessdpiaware
+// Also, thanks Jack Mordaunt! https://github.com/wailsapp/wails/issues/293
+func SetProcessDPIAware() error {
+	status, r, err := syscall.NewLazyDLL("user32.dll").NewProc("SetProcessDPIAware").Call()
+	if status == 0 {
+		return fmt.Errorf("exit status %d: %v %v", status, r, err)
+	}
+	return nil
+}

cmd/fs.go

@@ -132,6 +132,16 @@ func (fs *FSHelper) LocalDir(dir string) (*Dir, error) {
 	}, err
 }
 
+// LoadRelativeFile loads the given file relative to the caller's directory
+func (fs *FSHelper) LoadRelativeFile(relativePath string) ([]byte, error) {
+	_, filename, _, _ := runtime.Caller(0)
+	fullPath, err := filepath.Abs(filepath.Join(path.Dir(filename), relativePath))
+	if err != nil {
+		return nil, err
+	}
+	return ioutil.ReadFile(fullPath)
+}
+
 // GetSubdirs will return a list of FQPs to subdirectories in the given directory
 func (d *Dir) GetSubdirs() (map[string]string, error) {
 

cmd/helpers.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/leaanthony/mewn"
@@ -87,6 +88,17 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	buildCommand.Add("build")
 
 	if binaryName != "" {
+		// Alter binary name based on OS
+		switch runtime.GOOS {
+		case "windows":
+			if !strings.HasSuffix(binaryName, ".exe") {
+				binaryName += ".exe"
+			}
+		default:
+			if strings.HasSuffix(binaryName, ".exe") {
+				binaryName = strings.TrimSuffix(binaryName, ".exe")
+			}
+		}
 		buildCommand.Add("-o")
 		buildCommand.Add(binaryName)
 	}
@@ -103,7 +115,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	}
 
 	// Add windows flags
-	if runtime.GOOS == "windows" {
+	if runtime.GOOS == "windows" && buildMode == BuildModeProd {
 		ldflags += "-H windowsgui "
 	}
 
@@ -219,6 +231,15 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 
 	const md5sumFile = "package.json.md5"
 
+	// If node_modules does not exist, force a rebuild.
+	nodeModulesPath, err := filepath.Abs(filepath.Join(".", "node_modules"))
+	if err != nil {
+		return err
+	}
+	if !fs.DirExists(nodeModulesPath) {
+		forceRebuild = true
+	}
+
 	// If we aren't forcing the install and the md5sum file exists
 	if !forceRebuild && fs.FileExists(md5sumFile) {
 		// Yes - read contents

cmd/linux.go

@@ -43,8 +43,14 @@ const (
 	Kali
 	// Neon distribution
 	Neon
+	// ArcoLinux distribution
+	ArcoLinux
 	// Manjaro distribution
 	Manjaro
+	// ManjaroARM distribution
+	ManjaroARM
+	// Deepin distribution
+	Deepin
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -128,8 +134,14 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Kali
 	case "neon":
 		result.Distribution = Neon
+	case "arcolinux":
+		result.Distribution = ArcoLinux
 	case "manjaro":
 		result.Distribution = Manjaro
+	case "manjaro-arm":
+		result.Distribution = ManjaroARM
+	case "deepin":
+		result.Distribution = Deepin
 	default:
 		result.Distribution = Unknown
 	}

cmd/linuxdb.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"log"
 
-	"github.com/leaanthony/mewn"
 	"gopkg.in/yaml.v3"
 )
 
@@ -79,11 +78,14 @@ func (l *LinuxDB) GetDistro(distro string) *Distribution {
 // NewLinuxDB creates a new LinuxDB instance from the bundled
 // linuxdb.yaml file.
 func NewLinuxDB() *LinuxDB {
-	data := mewn.Bytes("./linuxdb.yaml")
+	data, err := fs.LoadRelativeFile("./linuxdb.yaml")
+	if err != nil {
+		log.Fatal("Could not load linuxdb.yaml")
+	}
 	result := LinuxDB{
 		Distributions: make(map[string]*Distribution),
 	}
-	err := result.ImportData(data)
+	err = result.ImportData(data)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/linuxdb.yaml

@@ -82,6 +82,15 @@ distributions:
         gccversioncommand: *gccdumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
+  deepin:
+    id: deepin
+    releases:
+      default:
+        version: default
+        name: Deepin
+        gccversioncommand: *gccdumpfullversion
+        programs: *debiandefaultprograms
+        libraries: *debiandefaultlibraries
   void:
     id: void
     releases:
@@ -158,6 +167,15 @@ distributions:
             help: Please install with `sudo pacman -S gtk3` and try again
           - name: webkit2gtk
             help: Please install with `sudo pacman -S webkit2gtk` and try again
+  arcolinux:
+    id: arcolinux
+    releases:
+      default:
+        version: default
+        name: ArcoLinux
+        gccversioncommand: *gccdumpversion
+        programs: *archdefaultprograms
+        libraries: *archdefaultlibraries
   manjaro:
     id: manjaro
     releases:
@@ -167,6 +185,15 @@ distributions:
         gccversioncommand: *gccdumpversion
         programs: *archdefaultprograms
         libraries: *archdefaultlibraries
+  manjaro-arm:
+    id: manjaro-arm
+    releases:
+      default:
+        version: default
+        name: Manjaro-ARM
+        gccversioncommand: *gccdumpversion
+        programs: *archdefaultprograms
+        libraries: *archdefaultlibraries
   gentoo:
     id: gentoo
     releases:

cmd/package.go

@@ -191,8 +191,15 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 
 	// Build syso
 	sysofile := filepath.Join(b.fs.Cwd(), basename+"-res.syso")
-	windresCommand := []string{"windres", "-o", sysofile, tgtRCFile}
-	err := NewProgramHelper().RunCommandArray(windresCommand)
+
+	batfile, err := fs.LocalDir(".")
+	if err != nil {
+		return err
+	}
+
+	windresBatFile := filepath.Join(batfile.fullPath, "windres.bat")
+	windresCommand := []string{windresBatFile, sysofile, tgtRCFile}
+	err = NewProgramHelper().RunCommandArray(windresCommand)
 	if err != nil {
 		return err
 	}

cmd/program.go

@@ -100,6 +100,19 @@ func (p *ProgramHelper) InstallGoPackage(packageName string) error {
 	return err
 }
 
+// InstallNPMPackage installs the given npm package
+func (p *ProgramHelper) InstallNPMPackage(packageName string, save bool) error {
+	args := strings.Split("install "+packageName, " ")
+	if save {
+		args = append(args, "--save")
+	}
+	_, stderr, err := p.shell.Run("npm", args...)
+	if err != nil {
+		fmt.Println(stderr)
+	}
+	return err
+}
+
 // RunCommand runs the given command
 func (p *ProgramHelper) RunCommand(command string) error {
 	args := strings.Split(command, " ")
@@ -115,6 +128,7 @@ func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
 		fmt.Printf("ERROR: Looks like '%s' isn't installed. Please install and try again.", program)
 		return err
 	}
+
 	args = args[1:]
 	var stderr string
 	var stdout string

cmd/project.go

@@ -13,6 +13,18 @@ import (
 	"github.com/leaanthony/slicer"
 )
 
+// PackageManager indicates different package managers
+type PackageManager int
+
+const (
+	// UNKNOWN package manager
+	UNKNOWN PackageManager = iota
+	// NPM package manager
+	NPM
+	// YARN package manager
+	YARN
+)
+
 type author struct {
 	Name  string `json:"name"`
 	Email string `json:"email"`
@@ -153,6 +165,23 @@ func (po *ProjectOptions) Defaults() {
 	po.WailsVersion = Version
 }
 
+// GetNPMBinaryName returns the type of package manager used by the project
+func (po *ProjectOptions) GetNPMBinaryName() (PackageManager, error) {
+	if po.FrontEnd == nil {
+		return UNKNOWN, fmt.Errorf("No frontend specified in project options")
+	}
+
+	if strings.Index(po.FrontEnd.Install, "npm") > -1 {
+		return NPM, nil
+	}
+
+	if strings.Index(po.FrontEnd.Install, "yarn") > -1 {
+		return YARN, nil
+	}
+
+	return UNKNOWN, nil
+}
+
 // PromptForInputs asks the user to input project details
 func (po *ProjectOptions) PromptForInputs() error {
 

cmd/system.go

@@ -274,9 +274,9 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()
 
 		switch distroInfo.Distribution {
-		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon:
+		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin:
 			libraryChecker = DpkgInstalled
-		case Arch, Manjaro:
+		case Arch, ArcoLinux, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora:
 			libraryChecker = RpmInstalled

cmd/templates/angular-template/frontend/browserslist

@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
+IE 9-11 # For IE 9-11 support, remove 'not'.

cmd/templates/angular-template/frontend/package.json.template

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "npx ng",
-    "start": "npx ng serve --poll=2000",
+    "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",
     "test": "npx ng test",
     "lint": "npx ng lint",
@@ -22,6 +22,7 @@
     "@angular/platform-browser-dynamic": "~8.0.1",
     "@angular/router": "~8.0.1",
     "@wailsapp/runtime": "^1.0.0",
+    "core-js": "^3.4.4",
     "ngx-build-plus": "^8.0.3",
     "rxjs": "~6.4.0",
     "tslib": "^1.9.0",

cmd/templates/angular-template/frontend/src/main.ts

@@ -1,3 +1,4 @@
+import 'core-js/stable';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 

cmd/templates/angular-template/frontend/src/wailsbridge.js

@@ -1,17 +0,0 @@
-/*
-    Wails Bridge (c) 2019-present Lea Anthony
-
-    This prod version is to get around having to rewrite your code
-    for production. When doing a release build, this file will be used 
-    instead of the full version.
-*/
-
-export default {
-  // The main function
-  // Passes the main Wails object to the callback if given.
-  Start: function(callback) {
-    if (callback) {
-      window.wails.events.on("wails:ready", callback);
-    }
-  }
-};

cmd/templates/angular-template/frontend/tsconfig.json

@@ -11,7 +11,7 @@
     "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": true,
-    "target": "es2015",
+    "target": "es5",
     "typeRoots": [
       "node_modules/@types"
     ],
@@ -20,4 +20,4 @@
       "dom"
     ]
   }
-}
+}