bump version

CONTRIBUTORS.md

@@ -22,8 +22,4 @@ Wails is what it is because of the time and effort given by these great people.
   * [Kris Raney](https://github.com/kraney)
   * [Jack Mordaunt](https://github.com/JackMordaunt)
   * [Michael Hipp](https://github.com/MichaelHipp)
-  * [Travis McLane](https://github.com/tmclane)
+  * [Travis McLane](https://github.com/tmclane)
-  * [Reuben Thomas-Davis](https://github.com/Rested)
-  * [Jarek](https://github.com/Jarek-SRT)
-  * [Konez2k](https://github.com/konez2k)
-  * [msms](https://github.com/sayuthisobri)

README.md

@@ -57,7 +57,7 @@ _Ubuntu: 16.04, 18.04, 19.04_
 
 _Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_
 
-#### Arch Linux / ArchLabs
+#### Arch Linux
 
 `sudo pacman -S webkit2gtk gtk3`
 

app_other.go

@@ -1,4 +1,4 @@
-// +build linux darwin !windows
+// +build +linux +darwin !windows
 
 package wails
 

cmd/fs.go

@@ -12,7 +12,6 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
-	"strings"
 
 	"github.com/leaanthony/slicer"
 )
@@ -48,22 +47,6 @@ func (fs *FSHelper) FileExists(path string) bool {
 	return fi.Mode().IsRegular()
 }
 
-// FindFile returns the first occurrence of match inside path.
-func (fs *FSHelper) FindFile(path, match string) (string, error) {
-	files, err := ioutil.ReadDir(path)
-	if err != nil {
-		return "", err
-	}
-
-	for _, f := range files {
-		if !f.IsDir() && strings.Contains(f.Name(), match) {
-			return f.Name(), nil
-		}
-	}
-
-	return "", fmt.Errorf("file not found")
-}
-
 // CreateFile creates a file at the given filename location with the contents
 // set to the given data. It will create intermediary directories if needed.
 func (fs *FSHelper) CreateFile(filename string, data []byte) error {
@@ -117,10 +100,10 @@ func (fs *FSHelper) RemoveFile(filename string) error {
 }
 
 // RemoveFiles removes the given filenames
-func (fs *FSHelper) RemoveFiles(files []string, continueOnError bool) error {
+func (fs *FSHelper) RemoveFiles(files []string) error {
 	for _, filename := range files {
 		err := os.Remove(filename)
-		if err != nil && !continueOnError {
+		if err != nil {
 			return err
 		}
 	}

cmd/helpers.go

@@ -5,15 +5,12 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"os/user"
 	"path/filepath"
 	"runtime"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/leaanthony/mewn"
-	"github.com/leaanthony/mewn/lib"
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
 )
@@ -59,141 +56,21 @@ func InstallGoDependencies(verbose bool) error {
 	return nil
 }
 
-// EmbedAssets will embed the built frontend assets via mewn.
+// BuildApplication will attempt to build the project based on the given inputs
-func EmbedAssets() ([]string, error) {
+func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
-	mewnFiles := lib.GetMewnFiles([]string{}, false)
 
-	referencedAssets, err := lib.GetReferencedAssets(mewnFiles)
+	// Generate Windows assets if needed
-	if err != nil {
+	if runtime.GOOS == "windows" {
-		return []string{}, err
+		cleanUp := !packageApp
-	}
+		err := NewPackageHelper().PackageWindows(projectOptions, cleanUp)
-
-	targetFiles := []string{}
-
-	for _, referencedAsset := range referencedAssets {
-		packfileData, err := lib.GeneratePackFileString(referencedAsset, false)
 		if err != nil {
-			return []string{}, err
+			return 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 {
-	// Check Docker
-	if err := CheckIfInstalled("docker"); err != nil {
-		return err
-	}
-
-	var packSpinner *spinner.Spinner
-	if !verbose {
-		packSpinner = spinner.New("Pulling wailsapp/xgo:latest docker image... (may take a while)")
-		packSpinner.SetSpinSpeed(50)
-		packSpinner.Start()
-	} else {
-		println("Pulling wailsapp/xgo:latest docker image... (may take a while)")
-	}
-
-	err := NewProgramHelper(verbose).RunCommandArray([]string{"docker",
-		"pull", "wailsapp/xgo:latest"})
-
-	if err != nil {
-		if packSpinner != nil {
-			packSpinner.Error()
-		}
-		return err
-	}
-	if packSpinner != nil {
-		packSpinner.Success()
-	}
-
-	return nil
-}
-
-// BuildDocker builds the project using the cross compiling wailsapp/xgo:latest container
-func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOptions) error {
-	var packSpinner *spinner.Spinner
-	if buildMode == BuildModeBridge {
-		return fmt.Errorf("you cant serve the application in cross-compilation")
-	}
-
-	// Check build directory
-	buildDirectory := filepath.Join(fs.Cwd(), "build")
-	if !fs.DirExists(buildDirectory) {
-		fs.MkDir(buildDirectory)
-	}
-
-	buildCommand := slicer.String()
-	userid := 1000
-	user, _ := user.Current()
-	if i, err := strconv.Atoi(user.Uid); err == nil {
-		userid = i
-	}
-	for _, arg := range []string{
-		"docker",
-		"run",
-		"--rm",
-		"-v", fmt.Sprintf("%s:/build", filepath.Join(fs.Cwd(), "build")),
-		"-v", fmt.Sprintf("%s:/source", fs.Cwd()),
-		"-e", fmt.Sprintf("LOCAL_USER_ID=%v", userid),
-		"-e", fmt.Sprintf("FLAG_LDFLAGS=%s", ldFlags(projectOptions, buildMode)),
-		"-e", "FLAG_V=false",
-		"-e", "FLAG_X=false",
-		"-e", "FLAG_RACE=false",
-		"-e", "FLAG_BUILDMODE=default",
-		"-e", "FLAG_TRIMPATH=false",
-		"-e", fmt.Sprintf("TARGETS=%s", projectOptions.Platform+"/"+projectOptions.Architecture),
-		"-e", "GOPROXY=",
-		"-e", "GO111MODULE=on",
-		"wailsapp/xgo:latest",
-		".",
-	} {
-		buildCommand.Add(arg)
-	}
-
-	compileMessage := fmt.Sprintf(
-		"Packing + Compiling project for %s/%s using docker image wailsapp/xgo:latest",
-		projectOptions.Platform, projectOptions.Architecture)
-
-	if buildMode == BuildModeDebug {
-		compileMessage += " (Debug Mode)"
-	}
-
-	if !projectOptions.Verbose {
-		packSpinner = spinner.New(compileMessage + "...")
-		packSpinner.SetSpinSpeed(50)
-		packSpinner.Start()
-	} else {
-		println(compileMessage)
-	}
-
-	err := NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice())
-	if err != nil {
-		if packSpinner != nil {
-			packSpinner.Error()
-		}
-		return err
-	}
-	if packSpinner != nil {
-		packSpinner.Success()
-	}
-
-	return nil
-}
-
-// BuildNative builds on the target platform itself.
-func BuildNative(binaryName string, forceRebuild bool, buildMode string, projectOptions *ProjectOptions) error {
-
 	// Check Mewn is installed
-	if err := CheckMewn(projectOptions.Verbose); err != nil {
+	err := CheckMewn(projectOptions.Verbose)
-		return err
+	if err != nil {
-	}
-
-	if err := CheckWindres(); err != nil {
 		return err
 	}
 
@@ -213,17 +90,18 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 	}
 
 	buildCommand := slicer.String()
-	buildCommand.Add("go")
+	buildCommand.Add("mewn")
 
-	buildCommand.Add("build")
 	if buildMode == BuildModeBridge {
 		// Ignore errors
 		buildCommand.Add("-i")
 	}
 
+	buildCommand.Add("build")
+
 	if binaryName != "" {
 		// Alter binary name based on OS
-		switch projectOptions.Platform {
+		switch runtime.GOOS {
 		case "windows":
 			if !strings.HasSuffix(binaryName, ".exe") {
 				binaryName += ".exe"
@@ -233,7 +111,7 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 				binaryName = strings.TrimSuffix(binaryName, ".exe")
 			}
 		}
-		buildCommand.Add("-o", filepath.Join("build", binaryName))
+		buildCommand.Add("-o", binaryName)
 	}
 
 	// If we are forcing a rebuild
@@ -241,13 +119,31 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 		buildCommand.Add("-a")
 	}
 
-	buildCommand.AddSlice([]string{"-ldflags", ldFlags(projectOptions, buildMode)})
+	// Setup ld flags
-
+	ldflags := "-w -s "
-	if projectOptions.Verbose {
+	if buildMode == BuildModeDebug {
-		fmt.Printf("Command: %v\n", buildCommand.AsSlice())
+		ldflags = ""
 	}
 
-	err := NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice())
+	// Add windows flags
+	if runtime.GOOS == "windows" && buildMode == BuildModeProd {
+		ldflags += "-H windowsgui "
+	}
+
+	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
+
+	// If we wish to generate typescript
+	if projectOptions.typescriptDefsFilename != "" {
+		cwd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+		filename := filepath.Join(cwd, projectOptions.FrontEnd.Dir, projectOptions.typescriptDefsFilename)
+		ldflags += " -X github.com/wailsapp/wails/lib/binding.typescriptDefinitionFilename=" + filename
+	}
+
+	buildCommand.AddSlice([]string{"-ldflags", ldflags})
+	err = NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice())
 	if err != nil {
 		if packSpinner != nil {
 			packSpinner.Error()
@@ -258,55 +154,7 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 		packSpinner.Success()
 	}
 
-	return nil
+	// packageApp
-}
-
-// BuildApplication will attempt to build the project based on the given inputs
-func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
-	var err error
-
-	// embed resources
-	targetFiles, err := EmbedAssets()
-	if err != nil {
-		return err
-	}
-
-	if projectOptions.CrossCompile {
-		if err := InitializeCrossCompilation(projectOptions.Verbose); err != nil {
-			return err
-		}
-	}
-
-	helper := NewPackageHelper(projectOptions.Platform)
-
-	// Generate windows resources
-	if projectOptions.Platform == "windows" {
-		if err := helper.PackageWindows(projectOptions, false); err != nil {
-			return err
-		}
-	}
-
-	// cleanup temporary embedded assets
-	defer func() {
-		for _, filename := range targetFiles {
-			if err := os.Remove(filename); err != nil {
-				fmt.Println(err)
-			}
-		}
-		if projectOptions.Platform == "windows" {
-			helper.CleanWindows(projectOptions)
-		}
-	}()
-
-	if projectOptions.CrossCompile {
-		err = BuildDocker(binaryName, buildMode, projectOptions)
-	} else {
-		err = BuildNative(binaryName, forceRebuild, buildMode, projectOptions)
-	}
-	if err != nil {
-		return err
-	}
-
 	if packageApp {
 		err = PackageApplication(projectOptions)
 		if err != nil {
@@ -319,14 +167,22 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 
 // PackageApplication will attempt to package the application in a platform dependent way
 func PackageApplication(projectOptions *ProjectOptions) error {
+	// Package app
+	message := "Generating .app"
+	if runtime.GOOS == "windows" {
+		err := CheckWindres()
+		if err != nil {
+			return err
+		}
+		message = "Generating resource bundle"
+	}
 	var packageSpinner *spinner.Spinner
 	if projectOptions.Verbose {
-		packageSpinner = spinner.New("Packaging application...")
+		packageSpinner = spinner.New(message)
 		packageSpinner.SetSpinSpeed(50)
 		packageSpinner.Start()
 	}
-
+	err := NewPackageHelper().Package(projectOptions)
-	err := NewPackageHelper(projectOptions.Platform).Package(projectOptions)
 	if err != nil {
 		if packageSpinner != nil {
 			packageSpinner.Error()
@@ -388,7 +244,7 @@ func CheckMewn(verbose bool) (err error) {
 
 // CheckWindres checks if Windres is installed and if not, aborts
 func CheckWindres() (err error) {
-	if runtime.GOOS != "windows" { // FIXME: Handle windows cross-compile for windows!
+	if runtime.GOOS != "windows" {
 		return nil
 	}
 	programHelper := NewProgramHelper()
@@ -398,15 +254,6 @@ func CheckWindres() (err error) {
 	return nil
 }
 
-// CheckIfInstalled returns if application is installed
-func CheckIfInstalled(application string) (err error) {
-	programHelper := NewProgramHelper()
-	if !programHelper.IsInstalled(application) {
-		return fmt.Errorf("%s not installed. Ensure you have installed %s correctly", application, application)
-	}
-	return nil
-}
-
 // InstallFrontendDeps attempts to install the frontend dependencies based on the given options
 func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool, caller string) error {
 
@@ -530,7 +377,7 @@ func ServeProject(projectOptions *ProjectOptions, logger *Logger) error {
 		time.Sleep(2 * time.Second)
 		logger.Green(">>>>> To connect, you will need to run '" + projectOptions.FrontEnd.Serve + "' in the '" + projectOptions.FrontEnd.Dir + "' directory <<<<<")
 	}()
-	location, err := filepath.Abs(filepath.Join("build", projectOptions.BinaryName))
+	location, err := filepath.Abs(projectOptions.BinaryName)
 	if err != nil {
 		return err
 	}
@@ -546,28 +393,3 @@ func ServeProject(projectOptions *ProjectOptions, logger *Logger) error {
 
 	return nil
 }
-
-func ldFlags(po *ProjectOptions, buildMode string) string {
-	// Setup ld flags
-	ldflags := "-w -s "
-	if buildMode == BuildModeDebug {
-		ldflags = ""
-	}
-
-	// Add windows flags
-	if po.Platform == "windows" && buildMode == BuildModeProd {
-		ldflags += "-H windowsgui "
-	}
-
-	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
-
-	// If we wish to generate typescript
-	if po.typescriptDefsFilename != "" {
-		cwd, err := os.Getwd()
-		if err == nil {
-			filename := filepath.Join(cwd, po.FrontEnd.Dir, po.typescriptDefsFilename)
-			ldflags += " -X github.com/wailsapp/wails/lib/binding.typescriptDefinitionFilename=" + filename
-		}
-	}
-	return ldflags
-}

cmd/linux.go

@@ -53,12 +53,6 @@ const (
 	Deepin
 	// Raspbian distribution
 	Raspbian
-	// Tumbleweed (OpenSUSE) distribution
-	Tumbleweed
-	// Leap (OpenSUSE) distribution
-	Leap
-	// ArchLabs distribution
-	ArchLabs
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -116,15 +110,13 @@ func parseOsRelease(osRelease string) *DistroInfo {
 	}
 
 	// Check distro name against list of distros
-	switch strings.ToLower(osID) {
+	switch osID {
 	case "fedora":
 		result.Distribution = Fedora
 	case "centos":
 		result.Distribution = CentOS
 	case "arch":
 		result.Distribution = Arch
-	case "archlabs":
-		result.Distribution = ArchLabs
 	case "debian":
 		result.Distribution = Debian
 	case "ubuntu":
@@ -155,10 +147,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Deepin
 	case "raspbian":
 		result.Distribution = Raspbian
-	case "opensuse-tumbleweed":
-		result.Distribution = Tumbleweed
-	case "opensuse-leap":
-		result.Distribution = Leap
 	default:
 		result.Distribution = Unknown
 	}

cmd/linux_test.go

@@ -22,25 +22,5 @@ UBUNTU_CODENAME=bionic
 	if result.Distribution != Ubuntu {
 		t.Errorf("expected 'Ubuntu' ID but got '%d'", result.Distribution)
 	}
-}
 
-func TestTumbleweedDetection(t *testing.T) {
-	osrelease := `
-NAME="openSUSE Tumbleweed"
-# VERSION="20200414"
-ID="opensuse-tumbleweed"
-ID_LIKE="opensuse suse"
-VERSION_ID="20200414"
-PRETTY_NAME="openSUSE Tumbleweed"
-ANSI_COLOR="0;32"
-CPE_NAME="cpe:/o:opensuse:tumbleweed:20200414"
-BUG_REPORT_URL="https://bugs.opensuse.org"
-HOME_URL="https://www.opensuse.org/"
-LOGO="distributor-logo"
-`
-
-	result := parseOsRelease(osrelease)
-	if result.Distribution != Tumbleweed {
-		t.Errorf("expected 'Tumbleweed' ID but got '%d'", result.Distribution)
-	}
 }

cmd/linuxdb.yaml

@@ -176,15 +176,6 @@ distributions:
         gccversioncommand: *gccdumpversion
         programs: *archdefaultprograms
         libraries: *archdefaultlibraries
-  archlabs:
-    id: archlabs
-    releases:
-      default:
-        version: default
-        name: ArchLabs
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries        
   manjaro:
     id: manjaro
     releases:
@@ -232,32 +223,3 @@ distributions:
         gccversioncommand: *gccdumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
-        
-  opensuse-tumbleweed:
-    id: opensuse-tumbleweed
-    releases:
-      default:
-        version: default
-        name: openSUSE Tumbleweed
-        gccversioncommand: *gccdumpfullversion
-        programs: &opensusedefaultprograms
-          - name: gcc
-            help: Please install with `sudo zypper in gcc-c++` and try again
-          - name: pkg-config
-            help: Please install with `sudo zypper in pkgconf-pkg-config` and try again
-          - name: npm
-            help: Please install `sudo zypper in nodejs` and try again
-        libraries: &opensusedefaultlibraries
-          - name: gtk3-devel
-            help: Please install with `sudo zypper in gtk3-devel` and try again
-          - name: webkit2gtk3-devel
-            help: Please install with `sudo zypper in webkit2gtk3-devel` and try again
-  opensuse-leap:
-      id: opensuse-leap
-      releases:
-        default:
-          version: default
-          name: openSUSE Leap
-          gccversioncommand: *gccdumpfullversion
-          programs: *opensusedefaultprograms
-          libraries: *opensusedefaultlibraries

cmd/package.go

@@ -1,12 +1,9 @@
 package cmd
 
 import (
-	"bufio"
 	"bytes"
-	"encoding/binary"
 	"fmt"
 	"image"
-	"image/png"
 	"io/ioutil"
 	"os"
 	"path"
@@ -16,26 +13,22 @@ import (
 	"text/template"
 	"time"
 
-	"golang.org/x/image/draw"
-
 	"github.com/jackmordaunt/icns"
 )
 
 // PackageHelper helps with the 'wails package' command
 type PackageHelper struct {
-	platform string
+	fs     *FSHelper
-	fs       *FSHelper
+	log    *Logger
-	log      *Logger
+	system *SystemHelper
-	system   *SystemHelper
 }
 
 // NewPackageHelper creates a new PackageHelper!
-func NewPackageHelper(platform string) *PackageHelper {
+func NewPackageHelper() *PackageHelper {
 	return &PackageHelper{
-		platform: platform,
+		fs:     NewFSHelper(),
-		fs:       NewFSHelper(),
+		log:    NewLogger(),
-		log:      NewLogger(),
+		system: NewSystemHelper(),
-		system:   NewSystemHelper(),
 	}
 }
 
@@ -60,87 +53,6 @@ func newPlistData(title, exe, packageID, version, author string) *plistData {
 	}
 }
 
-type windowsIconHeader struct {
-	_          uint16
-	imageType  uint16
-	imageCount uint16
-	width      uint8
-	height     uint8
-	colours    uint8
-	_          uint8
-	planes     uint16
-	bpp        uint16
-	size       uint32
-	offset     uint32
-}
-
-func generateWindowsIcon(pngFilename string, iconfile string) error {
-	header := &windowsIconHeader{
-		imageType:  1,
-		imageCount: 1,
-		bpp:        32,
-		planes:     1,
-		offset:     22,
-		width:      0,
-		height:     0,
-	}
-
-	// Load png
-	pngfile, err := os.Open(pngFilename)
-	if err != nil {
-		return err
-	}
-	defer pngfile.Close()
-
-	// Decode to internal image
-	pngdata, err := png.Decode(pngfile)
-	if err != nil {
-		return err
-	}
-
-	// Scale to 256*256
-	rect := image.Rect(0, 0, 255, 255)
-	rawdata := image.NewRGBA(rect)
-	scale := draw.ApproxBiLinear
-	scale.Scale(rawdata, rect, pngdata, pngdata.Bounds(), draw.Over, nil)
-
-	// Convert back to PNG
-	icondata := new(bytes.Buffer)
-	writer := bufio.NewWriter(icondata)
-	err = png.Encode(writer, rawdata)
-	if err != nil {
-		return err
-	}
-	err = writer.Flush()
-	if err != nil {
-		return err
-	}
-
-	// Save size of PNG data
-	header.size = uint32(len(icondata.Bytes()))
-
-	// Open icon file for writing
-	outfilename := filepath.Join(filepath.Dir(pngFilename), iconfile)
-	outfile, err := os.Create(outfilename)
-	if err != nil {
-		return err
-	}
-	defer outfile.Close()
-
-	// Write out the header
-	err = binary.Write(outfile, binary.LittleEndian, header)
-	if err != nil {
-		return err
-	}
-
-	// Write out the image data
-	_, err = outfile.Write(icondata.Bytes())
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func defaultString(val string, defaultVal string) string {
 	if val != "" {
 		return val
@@ -151,30 +63,29 @@ func defaultString(val string, defaultVal string) string {
 func (b *PackageHelper) getPackageFileBaseDir() string {
 	// Calculate template base dir
 	_, filename, _, _ := runtime.Caller(1)
-	return filepath.Join(path.Dir(filename), "packages", b.platform)
+	return filepath.Join(path.Dir(filename), "packages", runtime.GOOS)
 }
 
 // Package the application into a platform specific package
 func (b *PackageHelper) Package(po *ProjectOptions) error {
-	switch b.platform {
+	switch runtime.GOOS {
 	case "darwin":
+		// Check we have the exe
+		if !b.fs.FileExists(po.BinaryName) {
+			return fmt.Errorf("cannot bundle non-existent binary file '%s'. Please build with 'wails build' first", po.BinaryName)
+		}
 		return b.packageOSX(po)
 	case "windows":
-		return b.PackageWindows(po, true)
+		return b.PackageWindows(po, false)
 	case "linux":
-		return b.packageLinux(po)
+		return fmt.Errorf("linux is not supported at this time. Please see https://github.com/wailsapp/wails/issues/2")
 	default:
-		return fmt.Errorf("platform '%s' not supported for bundling yet", b.platform)
+		return fmt.Errorf("platform '%s' not supported for bundling yet", runtime.GOOS)
 	}
 }
 
-func (b *PackageHelper) packageLinux(po *ProjectOptions) error {
-	return nil
-}
-
 // Package the application for OSX
 func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
-	build := path.Join(b.fs.Cwd(), "build")
 
 	system := NewSystemHelper()
 	config, err := system.LoadConfig()
@@ -191,25 +102,18 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	appname := po.Name + ".app"
 
 	// Check binary exists
-	source := path.Join(build, exe)
+	source := path.Join(b.fs.Cwd(), exe)
-	if po.CrossCompile == true {
-		file, err := b.fs.FindFile(build, "darwin")
-		if err != nil {
-			return err
-		}
-		source = path.Join(build, file)
-	}
-
 	if !b.fs.FileExists(source) {
 		// We need to build!
-		return fmt.Errorf("Target '%s' not available. Has it been compiled yet?", source)
+		return fmt.Errorf("Target '%s' not available. Has it been compiled yet?", exe)
 	}
+
 	// Remove the existing package
 	os.RemoveAll(appname)
 
-	exeDir := path.Join(build, appname, "/Contents/MacOS")
+	exeDir := path.Join(b.fs.Cwd(), appname, "/Contents/MacOS")
 	b.fs.MkDirs(exeDir, 0755)
-	resourceDir := path.Join(build, appname, "/Contents/Resources")
+	resourceDir := path.Join(b.fs.Cwd(), appname, "/Contents/Resources")
 	b.fs.MkDirs(resourceDir, 0755)
 	tmpl := template.New("infoPlist")
 	plistFile := filepath.Join(b.getPackageFileBaseDir(), "info.plist")
@@ -225,7 +129,7 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	if err != nil {
 		return err
 	}
-	filename := path.Join(build, appname, "Contents", "Info.plist")
+	filename := path.Join(b.fs.Cwd(), appname, "Contents", "Info.plist")
 	err = ioutil.WriteFile(filename, tpl.Bytes(), 0644)
 	if err != nil {
 		return err
@@ -246,37 +150,22 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	return err
 }
 
-// CleanWindows removes any windows related files found in the directory
-func (b *PackageHelper) CleanWindows(po *ProjectOptions) {
-	pdir := b.fs.Cwd()
-	basename := strings.TrimSuffix(po.BinaryName, ".exe")
-	exts := []string{".ico", ".exe.manifest", ".rc", "-res.syso"}
-	rsrcs := []string{}
-	for _, ext := range exts {
-		rsrcs = append(rsrcs, filepath.Join(pdir, basename+ext))
-	}
-	b.fs.RemoveFiles(rsrcs, true)
-}
-
 // PackageWindows packages the application for windows platforms
 func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
-	outputDir := b.fs.Cwd()
 	basename := strings.TrimSuffix(po.BinaryName, ".exe")
 
-	// Copy default icon if needed
+	// Copy icon
-	icon, err := b.copyIcon()
+	tgtIconFile := filepath.Join(b.fs.Cwd(), basename+".ico")
-	if err != nil {
+	if !b.fs.FileExists(tgtIconFile) {
-		return err
+		srcIconfile := filepath.Join(b.getPackageFileBaseDir(), "wails.ico")
-	}
+		err := b.fs.CopyFile(srcIconfile, tgtIconFile)
-
+		if err != nil {
-	// Generate icon from PNG
+			return err
-	err = generateWindowsIcon(icon, po.BinaryName+".ico")
+		}
-	if err != nil {
-		return err
 	}
 
 	// Copy manifest
-	tgtManifestFile := filepath.Join(outputDir, basename+".exe.manifest")
+	tgtManifestFile := filepath.Join(b.fs.Cwd(), basename+".exe.manifest")
 	if !b.fs.FileExists(tgtManifestFile) {
 		srcManifestfile := filepath.Join(b.getPackageFileBaseDir(), "wails.exe.manifest")
 		err := b.fs.CopyFile(srcManifestfile, tgtManifestFile)
@@ -286,7 +175,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	}
 
 	// Copy rc file
-	tgtRCFile := filepath.Join(outputDir, basename+".rc")
+	tgtRCFile := filepath.Join(b.fs.Cwd(), basename+".rc")
 	if !b.fs.FileExists(tgtRCFile) {
 		srcRCfile := filepath.Join(b.getPackageFileBaseDir(), "wails.rc")
 		rcfilebytes, err := ioutil.ReadFile(srcRCfile)
@@ -301,37 +190,33 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	}
 
 	// Build syso
-	sysofile := filepath.Join(outputDir, basename+"-res.syso")
+	sysofile := filepath.Join(b.fs.Cwd(), basename+"-res.syso")
 
-	// cross-compile
+	batfile, err := fs.LocalDir(".")
-	if b.platform != runtime.GOOS {
+	if err != nil {
-		args := []string{
+		return err
-			"docker", "run", "--rm",
+	}
-			"-v", outputDir + ":/build",
-			"--entrypoint", "/bin/sh",
-			"wailsapp/xgo:latest",
-			"-c", "/usr/bin/x86_64-w64-mingw32-windres -o /build/" + basename + "-res.syso /build/" + basename + ".rc",
-		}
-		if err := NewProgramHelper().RunCommandArray(args); err != nil {
-			return err
-		}
-	} else {
-		batfile, err := fs.LocalDir(".")
-		if err != nil {
-			return err
-		}
 
-		windresBatFile := filepath.Join(batfile.fullPath, "windres.bat")
+	windresBatFile := filepath.Join(batfile.fullPath, "windres.bat")
-		windresCommand := []string{windresBatFile, sysofile, tgtRCFile}
+	windresCommand := []string{windresBatFile, sysofile, tgtRCFile}
-		err = NewProgramHelper().RunCommandArray(windresCommand)
+	err = NewProgramHelper().RunCommandArray(windresCommand)
+	if err != nil {
+		return err
+	}
+
+	// clean up
+	if cleanUp {
+		filesToDelete := []string{tgtIconFile, tgtManifestFile, tgtRCFile, sysofile}
+		err := b.fs.RemoveFiles(filesToDelete)
 		if err != nil {
 			return err
 		}
 	}
+
 	return nil
 }
 
-func (b *PackageHelper) copyIcon() (string, error) {
+func (b *PackageHelper) copyIcon(resourceDir string) (string, error) {
 
 	// TODO: Read this from project.json
 	const appIconFilename = "appicon.png"
@@ -356,7 +241,7 @@ func (b *PackageHelper) copyIcon() (string, error) {
 
 func (b *PackageHelper) packageIconOSX(resourceDir string) error {
 
-	srcIcon, err := b.copyIcon()
+	srcIcon, err := b.copyIcon(resourceDir)
 	if err != nil {
 		return err
 	}

cmd/packages/darwin/info.plist

@@ -1,6 +1,5 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
-	<key>CFBundlePackageType</key><string>APPL</string>
 	<key>CFBundleName</key><string>{{.Title}}</string>
 	<key>CFBundleExecutable</key><string>{{.Exe}}</string>
 	<key>CFBundleIdentifier</key><string>{{.PackageID}}</string>

cmd/program.go

@@ -138,11 +138,11 @@ func (p *ProgramHelper) RunCommand(command string) error {
 
 // RunCommandArray runs the command specified in the array
 func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
-	programCommand := args[0]
+	program := args[0]
 	// TODO: Run FindProgram here and get the full path to the exe
-	program, err := exec.LookPath(programCommand)
+	program, err := exec.LookPath(program)
 	if err != nil {
-		fmt.Printf("ERROR: Looks like '%s' isn't installed. Please install and try again.", programCommand)
+		fmt.Printf("ERROR: Looks like '%s' isn't installed. Please install and try again.", program)
 		return err
 	}
 

cmd/project.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"sort"
 	"strings"
 
@@ -158,9 +159,6 @@ type ProjectOptions struct {
 	WailsVersion           string
 	typescriptDefsFilename string
 	Verbose                bool `json:"-"`
-	CrossCompile           bool
-	Platform               string
-	Architecture           string
 }
 
 // Defaults sets the default project template
@@ -335,6 +333,11 @@ func processBinaryName(po *ProjectOptions) {
 	if po.BinaryName == "" {
 		var binaryNameComputed = computeBinaryName(po.Name)
 		po.BinaryName = Prompt("The output binary name", binaryNameComputed)
+		if runtime.GOOS == "windows" {
+			if !strings.HasSuffix(po.BinaryName, ".exe") {
+				po.BinaryName += ".exe"
+			}
+		}
 	}
 	fmt.Println("Output binary Name: " + po.BinaryName)
 }

cmd/system.go

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

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.6.0-pre2"
+const Version = "v1.0.3-pre2"

cmd/wails/4_build.go

@@ -3,24 +3,11 @@ package main
 import (
 	"fmt"
 	"os"
-	"runtime"
-	"strings"
 
 	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
 )
 
-// getSupportedPlatforms returns a slice of platform/architecture
-// targets that are buildable using the cross-platform 'x' option.
-func getSupportedPlatforms() []string {
-	return []string{
-		"darwin/amd64",
-		"linux/amd64",
-		"linux/arm-7",
-		"windows/amd64",
-	}
-}
-
 func init() {
 
 	var packageApp = false
@@ -28,7 +15,6 @@ func init() {
 	var debugMode = false
 	var typescriptFilename = ""
 	var verbose = false
-	var platform = ""
 
 	buildSpinner := spinner.NewSpinner()
 	buildSpinner.SetSpinSpeed(50)
@@ -42,14 +28,6 @@ func init() {
 		BoolFlag("verbose", "Verbose output", &verbose).
 		StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename)
 
-	var b strings.Builder
-	for _, plat := range getSupportedPlatforms() {
-		fmt.Fprintf(&b, " - %s\n", plat)
-	}
-	initCmd.StringFlag("x",
-		fmt.Sprintf("Cross-compile application to specified platform via xgo\n%s", b.String()),
-		&platform)
-
 	initCmd.Action(func() error {
 
 		message := "Building Application"
@@ -74,25 +52,6 @@ func init() {
 			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}
 
-		// Set cross-compile
-		projectOptions.Platform = runtime.GOOS
-		if len(platform) > 0 {
-			supported := false
-			for _, plat := range getSupportedPlatforms() {
-				if plat == platform {
-					supported = true
-				}
-			}
-			if !supported {
-				return fmt.Errorf("Unsupported platform '%s' specified.\nPlease run `wails build -h` to see the supported platform/architecture options.", platform)
-			}
-
-			projectOptions.CrossCompile = true
-			plat := strings.Split(platform, "/")
-			projectOptions.Platform = plat[0]
-			projectOptions.Architecture = plat[1]
-		}
-
 		// Validate config
 		// Check if we have a frontend
 		err = cmd.ValidateFrontendConfig(projectOptions)

cmd/wails/6_serve.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"runtime"
 
 	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
@@ -36,7 +35,6 @@ func init() {
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 		projectOptions.Verbose = verbose
-		projectOptions.Platform = runtime.GOOS
 
 		// Check we are in project directory
 		// Check project.json loads correctly

go.mod

@@ -22,7 +22,6 @@ require (
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
 	golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 // indirect
-	golang.org/x/image v0.0.0-20200430140353-33d19683fad8
 	golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 // indirect
 	golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862
 	golang.org/x/text v0.3.0

go.sum

@@ -70,8 +70,6 @@ golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-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/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 h1:6M3SDHlHHDCx2PcQw3S4KsR170vGqDhJDOmpVd4Hjak=
 golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

lib/renderer/bridge/bridge.go

@@ -42,12 +42,12 @@ type Bridge struct {
 	server *http.Server
 
 	lock     sync.Mutex
-	sessions map[string]*session
+	sessions map[string]session
 }
 
 // Initialise the Bridge Renderer
 func (h *Bridge) Initialise(appConfig interfaces.AppConfig, ipcManager interfaces.IPCManager, eventManager interfaces.EventManager) error {
-	h.sessions = map[string]*session{}
+	h.sessions = map[string]session{}
 	h.ipcManager = ipcManager
 	h.appConfig = appConfig
 	h.eventManager = eventManager
@@ -70,11 +70,13 @@ func (h *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *Bridge) startSession(conn *websocket.Conn) {
-	s := newSession(conn,
+	s := session{
-		h.bindingCache,
+		conn:         conn,
-		h.ipcManager,
+		bindingCache: h.bindingCache,
-		logger.NewCustomLogger("BridgeSession"),
+		ipc:          h.ipcManager,
-		h.eventManager)
+		log:          h.log,
+		eventManager: h.eventManager,
+	}
 
 	conn.SetCloseHandler(func(int, string) error {
 		h.log.Infof("Connection dropped [%s].", s.Identifier())
@@ -158,7 +160,7 @@ func (h *Bridge) NotifyEvent(event *messages.EventData) error {
 	}
 
 	message := fmt.Sprintf("window.wails._.Notify('%s','%s')", event.Name, data)
-	dead := []*session{}
+	dead := []session{}
 	for _, session := range h.sessions {
 		err := session.evalJS(message, notifyMessage)
 		if err != nil {
@@ -205,9 +207,6 @@ func (h *Bridge) SetTitle(title string) {
 // for the Renderer interface
 func (h *Bridge) Close() {
 	h.log.Debug("Shutting down")
-	for _, session := range h.sessions {
-		session.Shutdown()
-	}
 	err := h.server.Close()
 	if err != nil {
 		h.log.Errorf(err.Error())

lib/renderer/bridge/session.go

@@ -1,8 +1,7 @@
 package renderer
 
 import (
-	"time"
+	"sync"
-	"unsafe"
 
 	"github.com/gorilla/websocket"
 	"github.com/leaanthony/mewn"
@@ -21,22 +20,7 @@ type session struct {
 	ipc          interfaces.IPCManager
 
 	// Mutex for writing to the socket
-	shutdown  chan bool
+	lock sync.Mutex
-	writeChan chan []byte
-
-	done bool
-}
-
-func newSession(conn *websocket.Conn, bindingCache []string, ipc interfaces.IPCManager, logger *logger.CustomLogger, eventMgr interfaces.EventManager) *session {
-	return &session{
-		conn:         conn,
-		bindingCache: bindingCache,
-		ipc:          ipc,
-		log:          logger,
-		eventManager: eventMgr,
-		shutdown:     make(chan bool),
-		writeChan:    make(chan []byte, 100),
-	}
 }
 
 // Identifier returns a string identifier for the remote connection.
@@ -49,15 +33,19 @@ func (s *session) Identifier() string {
 }
 
 func (s *session) sendMessage(msg string) error {
-	if !s.done {
+	s.lock.Lock()
-		s.writeChan <- *(*[]byte)(unsafe.Pointer(&msg))
+	defer s.lock.Unlock()
+
+	if err := s.conn.WriteMessage(websocket.TextMessage, []byte(msg)); err != nil {
+		s.log.Debug(err.Error())
+		return err
 	}
+
 	return nil
 }
 
 func (s *session) start(firstSession bool) {
 	s.log.Infof("Connected to frontend.")
-	go s.writePump()
 
 	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
 	s.evalJS(wailsRuntime, wailsRuntimeMessage)
@@ -86,10 +74,6 @@ func (s *session) start(firstSession bool) {
 		s.log.Debugf("Got message: %#v\n", string(buffer))
 
 		s.ipc.Dispatch(string(buffer), s.Callback)
-
-		if s.done {
-			break
-		}
 	}
 }
 
@@ -99,38 +83,8 @@ func (s *session) Callback(data string) error {
 }
 
 func (s *session) evalJS(js string, mtype messageType) error {
+
 	// Prepend message type to message
 	return s.sendMessage(mtype.toString() + js)
-}
 
-// Shutdown
-func (s *session) Shutdown() {
-	s.done = true
-	s.shutdown <- true
-	s.log.Debugf("session %v exit", s.Identifier())
-}
-
-// writePump pulls messages from the writeChan and sends them to the client
-// since it uses a channel to read the messages the socket is protected without locks
-func (s *session) writePump() {
-	s.log.Debugf("Session %v - writePump start", s.Identifier())
-	for {
-		select {
-		case msg, ok := <-s.writeChan:
-			s.conn.SetWriteDeadline(time.Now().Add(1 * time.Second))
-			if !ok {
-				s.log.Debug("writeChan was closed!")
-				s.conn.WriteMessage(websocket.CloseMessage, []byte{})
-				return
-			}
-
-			if err := s.conn.WriteMessage(websocket.TextMessage, msg); err != nil {
-				s.log.Debug(err.Error())
-				return
-			}
-		case <-s.shutdown:
-			break
-		}
-	}
-	s.log.Debug("writePump exiting...")
 }

lib/renderer/webview/webview.h

@@ -139,7 +139,7 @@ struct webview_priv
 #define DEFAULT_URL                                                            \
   "data:text/"                                                                 \
   "html,%3C%21DOCTYPE%20html%3E%0A%3Chtml%20lang=%22en%22%3E%0A%3Chead%3E%"    \
-  "3Cmeta%20charset=%22utf-8%22%3E%3Cmeta%20http-equiv=%22IE=edge%22%"         \
+  "3Cmeta%20charset=%22utf-8%22%3E%3Cmeta%20http-equiv=%22IE=edge%22%" \
   "20content=%22IE=edge%22%3E%3C%2Fhead%3E%0A%3Cbody%3E%3Cdiv%20id=%22app%22%" \
   "3E%3C%2Fdiv%3E%3Cscript%20type=%22text%2Fjavascript%22%3E%3C%2Fscript%3E%"  \
   "3C%2Fbody%3E%0A%3C%2Fhtml%3E"
@@ -1227,7 +1227,7 @@ struct webview_priv
       }
       VariantInit(&myURL);
       myURL.vt = VT_BSTR;
-      // #ifndef UNICODE
+// #ifndef UNICODE
       {
         wchar_t *buffer = webview_to_utf16(webPageName);
         if (buffer == NULL)
@@ -1237,9 +1237,9 @@ struct webview_priv
         myURL.bstrVal = SysAllocString(buffer);
         GlobalFree(buffer);
       }
-      // #else
+// #else
-      //       myURL.bstrVal = SysAllocString(webPageName);
+//       myURL.bstrVal = SysAllocString(webPageName);
-      // #endif
+// #endif
       if (!myURL.bstrVal)
       {
       badalloc:
@@ -1277,7 +1277,7 @@ struct webview_priv
             if (!SafeArrayAccessData(sfArray, (void **)&pVar))
             {
               pVar->vt = VT_BSTR;
-              // #ifndef UNICODE
+// #ifndef UNICODE
               {
                 wchar_t *buffer = webview_to_utf16(url);
                 if (buffer == NULL)
@@ -1287,9 +1287,9 @@ struct webview_priv
                 bstr = SysAllocString(buffer);
                 GlobalFree(buffer);
               }
-              // #else
+// #else
-              //               bstr = SysAllocString(url);
+//               bstr = SysAllocString(url);
-              // #endif
+// #endif
               if ((pVar->bstrVal = bstr))
               {
                 htmlDoc2->lpVtbl->write(htmlDoc2, sfArray);
@@ -1444,12 +1444,12 @@ struct webview_priv
                        rect.right - rect.left, rect.bottom - rect.top,
                        HWND_DESKTOP, NULL, hInstance, (void *)w);
 #else
-    w->priv.hwnd =
+  w->priv.hwnd =
         CreateWindowEx(0, classname, w->title, style, rect.left, rect.top,
                        rect.right - rect.left, rect.bottom - rect.top,
                        HWND_DESKTOP, NULL, hInstance, (void *)w);
 #endif
-
+    
     if (w->priv.hwnd == 0)
     {
       OleUninitialize();
@@ -1466,7 +1466,8 @@ struct webview_priv
 #else
     SetWindowText(w->priv.hwnd, w->title);
 #endif
-
+    
+    
     ShowWindow(w->priv.hwnd, SW_SHOWDEFAULT);
     UpdateWindow(w->priv.hwnd);
     SetFocus(w->priv.hwnd);
@@ -1493,11 +1494,6 @@ struct webview_priv
     case WM_KEYDOWN:
     case WM_KEYUP:
     {
-      // Disable refresh when pressing F5 on windows
-      if (msg.wParam == VK_F5)
-      {
-        break;
-      }
       HRESULT r = S_OK;
       IWebBrowser2 *webBrowser2;
       IOleObject *browser = *w->priv.browser;
@@ -1607,7 +1603,7 @@ struct webview_priv
 
   WEBVIEW_API void webview_set_title(struct webview *w, const char *title)
   {
-#ifdef UNICODE
+  #ifdef UNICODE
     wchar_t *u16title = webview_to_utf16(title);
     if (u16title == NULL)
     {
@@ -1615,11 +1611,12 @@ struct webview_priv
     }
     SetWindowText(w->priv.hwnd, u16title);
     GlobalFree(u16title);
-#else
+  #else
     SetWindowText(w->priv.hwnd, title);
-#endif
+  #endif
   }
 
+
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     if (w->priv.is_fullscreen == !!fullscreen)
@@ -1930,26 +1927,22 @@ struct webview_priv
     [script setValue:self forKey:@"external"];
   }
 
-  static void webview_run_input_open_panel(id self, SEL cmd, id webview,
+static void webview_run_input_open_panel(id self, SEL cmd, id webview,
-                                           id listener, BOOL allowMultiple)
+                                           id listener, BOOL allowMultiple) {
-  {
     char filename[256] = "";
     struct webview *w =
         (struct webview *)objc_getAssociatedObject(self, "webview");
 
     webview_dialog(w, WEBVIEW_DIALOG_TYPE_OPEN, WEBVIEW_DIALOG_FLAG_FILE, "", "",
                    filename, 255);
-    filename[255] = '\0';
+    if (strlen(filename)) {
-    if (strlen(filename) > 0)
-    {
       [listener chooseFilename:[NSString stringWithUTF8String:filename]];
-    }
+    } else {
-    else
-    {
       [listener cancel];
     }
   }
 
+
   static void webview_external_invoke(id self, SEL cmd, id arg)
   {
     struct webview *w =
@@ -1962,7 +1955,7 @@ struct webview_priv
     {
       return;
     }
-    w->external_invoke_cb(w, [(NSString *)(arg) UTF8String]);
+    w->external_invoke_cb(w, [(NSString *)(arg)UTF8String]);
   }
 
   WEBVIEW_API int webview_init(struct webview *w)

runtime/js/runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wailsapp/runtime",
-  "version": "1.0.11",
+  "version": "1.0.10",
   "description": "Wails Javascript runtime library",
   "main": "main.js",
   "types": "runtime.d.ts",
@@ -25,4 +25,4 @@
   "devDependencies": {
     "dts-gen": "^0.5.8"
   }
-}
+}

runtime/js/runtime/runtime.d.ts

@@ -6,12 +6,12 @@ declare const wailsapp__runtime: {
         OpenURL(url: string): Promise<any>;
     };
     Events: {
-        Acknowledge(eventName: string): void;
+        Acknowledge(eventName: string): void; 
-        Emit(eventName: string, data?: any): void;
+        Emit(eventName: string): void;
-        Heartbeat(eventName: string, timeInMilliseconds: number, callback: (data?: any) => void): void;
+        Heartbeat(eventName: string, timeInMilliseconds: number, callback: () => void): void;
-        On(eventName: string, callback: (data?: any) => void): void;
+        On(eventName: string, callback: () => void): void;
-        OnMultiple(eventName: string, callback: (data?: any) => void, maxCallbacks: number): void;
+        OnMultiple(eventName: string, callback: () => void, maxCallbacks: number): void;
-        Once(eventName: string, callback: (data?: any) => void): void;
+        Once(eventName: string, callback: () => void): void;
     };
     Init(callback: () => void): void;
     Log: {

scripts/build.sh

@@ -1,13 +1,5 @@
 #!/usr/bin/env bash
 
-echo "**** Checking if Wails passes unit tests ****"
-if ! go test ./...
-then
-    echo ""
-    echo "ERROR: Unit tests failed!"
-    exit 1;
-fi
-
 # Build runtime
 echo "**** Building Runtime ****"
 cd runtime/js
@@ -23,23 +15,9 @@ cd lib/renderer
 mewn
 cd ../..
 
-
-cd cmd/wails
-echo "**** Checking if Wails compiles ****"
-if ! go build .
-then
-    echo ""
-    echo "ERROR: Build failed!"
-    exit 1;
-fi
-
 echo "**** Installing Wails locally ****"
-if ! go install
+cd cmd/wails
-then
+go install
-    echo ""
-    echo "ERROR: Install failed!"
-    exit 1;
-fi
 cd ../..
 
 echo "**** Tidying the mods! ****"