Merge pull request #70 from wailsapp/update-webview

Update webview to 0.2.7

.gitignore

@@ -15,4 +15,5 @@ examples/**/example*
 !examples/**/*.*
 cmd/wails/wails
 .DS_Store
-tmp
+tmp
+dist

.goreleaser.yml

@@ -0,0 +1,34 @@
+# This is an example goreleaser.yaml file with some sane defaults.
+# Make sure to check the documentation at http://goreleaser.com
+
+builds:
+- env:
+  - CGO_ENABLED=0
+  goos:
+    - windows
+    - linux
+    - darwin
+  goarch:
+    - 386
+    - amd64
+  ignore:
+  - goos: darwin
+    goarch: 386
+  main: ./cmd/wails/main.go
+archive:
+  replacements:
+    darwin: Darwin
+    linux: Linux
+    windows: Windows
+    386: i386
+    amd64: x86_64
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+    - '^docs:'
+    - '^test:'

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "go.formatTool": "goimports"
+}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 wailsapp
+Copyright (c) 2018-Present Lea Anthony
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1 +1,84 @@
-# Coming Soon
+<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/>
+</p>
+<p align="center">
+   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://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>
+</p>
+
+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!
+
+## Features
+
+- Use standard Go libraries/frameworks for the backend
+- Use any frontend technology to build your UI
+- Expose Go methods/functions to the frontend via a single bind command
+- Uses native rendering engines - no embedded browser
+- Shared events system
+- Native file dialogs
+- Powerful cli tool
+- Multiplatform
+
+## Installation
+
+Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as an installation of Go. The basic requirements are:
+
+- Go 1.11 or above
+- npm
+
+### MacOS
+
+Make sure you have the xcode command line tools installed. This can be done by running:
+
+`xcode-select --install`
+
+### Linux
+
+#### Ubuntu 18.04
+
+`sudo apt install pkg-config build-essential libgtk-3-dev libwebkit2gtk-4.0-dev`
+
+Note: If you have successfully installed these dependencies on a different flavour of Linux, please consider submitting a PR.
+
+### Windows
+
+Windows requires gcc and related tooling. The recommended download is from [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download). Once this is installed, you are good to go.
+
+## Installation
+
+Installation is as simple as running the following command:
+
+<pre style='color:white'>
+go get -u github.com/wailsapp/wails/cmd/wails
+</pre>
+
+## Next Steps
+
+It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
+
+## FAQ
+
+ * Is this an alternative to Electron?
+
+   Depends on your requirements. It's designed to make it easy for Go programmers to make lightweight desktop applications or add a frontend to their existing applications. Whilst Wails does not currently offer hooks into native elements such as menus, this may change in the future.
+
+ * Who is this project aimed at?
+
+   Go programmers who want to bundle an HMTL frontend with their applications, without resorting to creating a server and opening a browser to view it.
+
+## Shoulders of Giants
+
+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 you can throw a stick at.
+  * [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses for the windowing.
+
+Special Mentions:
+
+  * [Bill Kennedy](https://twitter.com/goinggodotnet) - Go guru, encourager and all-round nice guy, whose 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.
+

app.go

@@ -70,7 +70,11 @@ func (a *App) Run() error {
 	}
 
 	a.logLevel = "error"
-	return a.start()
+	err := a.start()
+	if err != nil {
+		a.log.Error(err.Error())
+	}
+	return err
 }
 
 func (a *App) start() error {
@@ -114,9 +118,7 @@ func (a *App) start() error {
 	a.renderer.AddJSList(a.jsCache)
 
 	// Run the renderer
-	a.renderer.Run()
-
-	return nil
+	return a.renderer.Run()
 }
 
 // Bind allows the user to bind the given object

app_cli.go

@@ -1,8 +1,6 @@
 package wails
 
 import (
-	"fmt"
-
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -11,6 +9,7 @@ func (app *App) setupCli() *cmd.Cli {
 
 	// Create a new cli
 	result := cmd.NewCli(app.config.Title, "Debug build")
+	result.Version(cmd.Version)
 
 	// Setup cli to handle loglevel and headless flags
 	result.
@@ -21,8 +20,6 @@ func (app *App) setupCli() *cmd.Cli {
 	// Banner
 	result.PreRun(func(cli *cmd.Cli) error {
 		log := cmd.NewLogger()
-		log.PrintSmallBanner()
-		fmt.Println()
 		log.YellowUnderline(app.config.Title + " - Debug Build")
 		return nil
 	})

binding_function.go

@@ -153,8 +153,11 @@ func (b *boundFunction) setInputValue(index int, typ reflect.Type, val interface
 		}
 	}()
 
-	// Do the conversion
-	result = reflect.ValueOf(val).Convert(typ)
-
+	// Translate javascript null values
+	if val == nil {
+		result = reflect.Zero(typ)
+	} else {
+		result = reflect.ValueOf(val).Convert(typ)
+	}
 	return result, err
 }

cmd/cli.go

@@ -195,10 +195,7 @@ func (c *Command) Action(callback Action) *Command {
 // PrintHelp - Output the help text for this command
 func (c *Command) PrintHelp() {
 	c.log.PrintBanner()
-	versionString := c.AppVersion
-	if versionString != "" {
-		versionString = " " + versionString
-	}
+
 	commandTitle := c.CommandPath
 	if c.Shortdescription != "" {
 		commandTitle += " - " + c.Shortdescription

cmd/helpers.go

@@ -5,11 +5,11 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"path"
 	"path/filepath"
 	"runtime"
 	"time"
 
+	mewn "github.com/leaanthony/mewn"
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
 )
@@ -36,7 +36,7 @@ func ValidateFrontendConfig(projectOptions *ProjectOptions) error {
 
 // InstallGoDependencies will run go get in the current directory
 func InstallGoDependencies() error {
-	depSpinner := spinner.New("Installing Dependencies...")
+	depSpinner := spinner.New("Ensuring Dependencies are up to date...")
 	depSpinner.SetSpinSpeed(50)
 	depSpinner.Start()
 	err := NewProgramHelper().RunCommand("go get")
@@ -77,7 +77,13 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	packSpinner.Start()
 
 	buildCommand := slicer.String()
-	buildCommand.AddSlice([]string{"mewn", "build"})
+	buildCommand.Add("mewn")
+
+	if buildMode == BuildModeBridge {
+		// Ignore errors
+		buildCommand.Add("-i")
+	}
+	buildCommand.Add("build")
 
 	if binaryName != "" {
 		buildCommand.Add("-o")
@@ -110,6 +116,14 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	}
 	packSpinner.Success()
 
+	// packageApp
+	if packageApp {
+		err = PackageApplication(projectOptions)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -189,7 +203,7 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	}
 
 	// Check if frontend deps have been updated
-	feSpinner := spinner.New("Installing frontend dependencies (This may take a while)...")
+	feSpinner := spinner.New("Ensuring frontend dependencies are up to date (This may take a while)")
 	feSpinner.SetSpinSpeed(50)
 	feSpinner.Start()
 
@@ -240,10 +254,10 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	}
 
 	// Copy bridge to project
-	_, filename, _, _ := runtime.Caller(1)
-	bridgeFileSource := filepath.Join(path.Dir(filename), "..", "..", "wailsruntimeassets", "bridge", bridgeFile)
+	bridgeAssets := mewn.Group("../wailsruntimeassets/bridge/")
+	bridgeFileData := bridgeAssets.Bytes(bridgeFile)
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js")
-	err = fs.CopyFile(bridgeFileSource, bridgeFileTarget)
+	err = fs.CreateFile(bridgeFileTarget, bridgeFileData)
 	if err != nil {
 		return err
 	}

cmd/linux.go

@@ -12,7 +12,7 @@ const (
 	// Unknown is the catch-all distro
 	Unknown LinuxDistribution = 0
 	// Ubuntu distribution
-	Ubuntu  LinuxDistribution = 1
+	Ubuntu LinuxDistribution = 1
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -67,13 +67,11 @@ func GetLinuxDistroInfo() *DistroInfo {
 
 // DpkgInstalled uses dpkg to see if a package is installed
 func DpkgInstalled(packageName string) (bool, error) {
-	result := false
 	program := NewProgramHelper()
 	dpkg := program.FindProgram("dpkg")
 	if dpkg == nil {
 		return false, fmt.Errorf("cannot check dependencies: dpkg not found")
 	}
 	_, _, exitCode, _ := dpkg.Run("-L", packageName)
-	result = exitCode == 0
-	return result, nil
+	return exitCode == 0, nil
 }

cmd/package.go

@@ -72,7 +72,7 @@ func (b *PackageHelper) Package(po *ProjectOptions) error {
 	case "darwin":
 		// Check we have the exe
 		if !b.fs.FileExists(po.BinaryName) {
-			return fmt.Errorf("cannot bundle non-existant binary file '%s'. Please build with 'wails build' first", 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":
@@ -255,9 +255,5 @@ func (b *PackageHelper) packageIconOSX(resourceDir string) error {
 
 	}
 	defer dest.Close()
-	if err := icns.Encode(dest, srcImg); err != nil {
-		return err
-
-	}
-	return nil
+	return icns.Encode(dest, srcImg)
 }

cmd/program.go

@@ -56,7 +56,7 @@ func (p *Program) GetFullPathToBinary() (string, error) {
 }
 
 // Run will execute the program with the given parameters
-// Returns stdout + stderr as strings and an error if one occured
+// Returns stdout + stderr as strings and an error if one occurred
 func (p *Program) Run(vars ...string) (stdout, stderr string, exitCode int, err error) {
 	command, err := p.GetFullPathToBinary()
 	if err != nil {

cmd/setup.go

@@ -1 +0,0 @@
-package cmd

cmd/system.go

@@ -81,21 +81,24 @@ func (s *SystemHelper) BackupConfig() (string, error) {
 
 func (s *SystemHelper) setup() error {
 
+	systemConfig := make(map[string]string)
+
 	// Try to load current values - ignore errors
-	config, err := s.LoadConfig()
-	defaultName := ""
-	defaultEmail := ""
-	if config != nil {
-		defaultName = config.Name
-		defaultEmail = config.Email
+	config, _ := s.LoadConfig()
+
+	if config.Name != "" {
+		systemConfig["name"] = PromptRequired("What is your name", config.Name)
+	} else {
+		systemConfig["name"] = PromptRequired("What is your name")
+	}
+	if config.Email != "" {
+		systemConfig["email"] = PromptRequired("What is your email address", config.Email)
+	} else {
+		systemConfig["email"] = PromptRequired("What is your email address")
 	}
 
-	systemConfig := make(map[string]string)
-	systemConfig["name"] = PromptRequired("What is your name", defaultName)
-	systemConfig["email"] = PromptRequired("What is your email address", defaultEmail)
-
 	// Create the directory
-	err = s.fs.MkDirs(s.wailsSystemDir)
+	err := s.fs.MkDirs(s.wailsSystemDir)
 	if err != nil {
 		return err
 	}

cmd/templates/vuebasic/frontend/public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>my-vue-app-01</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but my-vue-app-01 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>

cmd/templates/vuebasic/frontend/src/main.js

@@ -2,6 +2,7 @@ import Vue from "vue";
 import App from "./App.vue";
 
 Vue.config.productionTip = false;
+Vue.config.devtools = true;
 
 import Bridge from "./wailsbridge";
 

cmd/templates/vuebasic/main.go.template

@@ -11,12 +11,15 @@ func basic() string {
 
 func main() {
 
+  js := mewn.String("./frontend/dist/app.js")
+  css := mewn.String("./frontend/dist/app.css")
+
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,
     Height: 768,
     Title:  "{{.Name}}",
-    JS:     mewn.String("./frontend/dist/app.js"),
-    CSS:    mewn.String("./frontend/dist/app.css"),
+    JS:     js,
+    CSS:    css,
     Colour: "#131313",
   })
   app.Bind(basic)