fix: binding more than one struct method

.gitignore

@@ -16,5 +16,4 @@ examples/**/example*
 cmd/wails/wails
 .DS_Store
 tmp
-node_modules/
-/runtime/js/runtime/dist
+node_modules/

CONTRIBUTORS.md

@@ -18,6 +18,3 @@ Wails is what it is because of the time and effort given by these great people.
 * [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)
-* [soon cheol shin](https://github.com/scshin0572)

README.md

@@ -8,10 +8,9 @@
    <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://dev.azure.com/leaanthony/Wails/_build/latest?definitionId=1&branchName=master" rel="nofollow"><img src="https://dev.azure.com/leaanthony/Wails/_apis/build/status/wailsapp.wails?branchName=master" alt="Pipelines"></a>
+   <a href="https://dashboard.guardrails.io/default/gh/wailsapp/wails"><img src="https://badges.guardrails.io/wailsapp/wails.svg?token=53657bc22ec360d7673c894fdd70568e918ec581d10d84427ed4de5fe1eeff1a"></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!
@@ -61,7 +60,7 @@ _Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, K
 
 `sudo pacman -S webkit2gtk gtk3`
 
-_Also succesfully test on: Manjaro & ArcoLinux_
+_Also succesfully test on: ArcoLinuxB_
 
 #### Centos
 
@@ -144,7 +143,3 @@ This project was mainly coded to the following albums:
   * [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)
-
-## Licensing
-
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large)

app.go

@@ -1,11 +1,6 @@
 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"
@@ -44,7 +39,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	}
 
 	result := &App{
-		logLevel:       "debug",
+		logLevel:       "info",
 		renderer:       renderer.NewWebView(),
 		ipc:            ipc.NewManager(),
 		bindingManager: binding.NewManager(),
@@ -71,7 +66,6 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 
 // Run the app
 func (a *App) Run() error {
-
 	if BuildMode != cmd.BuildModeProd {
 		return a.cli.Run()
 	}
@@ -103,18 +97,6 @@ func (a *App) start() error {
 		return err
 	}
 
-	// Set debug mode
-	if runtime.GOOS == "windows" && BuildMode == cmd.BuildModeDebug {
-		a.renderer.EnableDebug()
-	}
-
-	// 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)
 
@@ -130,33 +112,8 @@ func (a *App) start() error {
 		return err
 	}
 
-	// Defer the shutdown
-	defer a.shutdown()
-
 	// Run the renderer
-	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")
+	return a.renderer.Run()
 }
 
 // Bind allows the user to bind the given object

azure-pipelines.yml

@@ -1,138 +0,0 @@
-# avoid double trigger by applying some rules
-# start a pipeline when push to 'master' branch 
-trigger:
-- master
-# or when pull request on 'develop' branch
-pr:
-- develop
-
-# for now there is only one stage 'Build'
-# in the future we could use multistage strategy for releases
-stages:
-- stage: Build
-
-  # there are 3 jobs
-  # one for each os
-  jobs:
-  - deployment: Linux
-    displayName: Lin
-    variables:
-      GOPATH: '$(Agent.BuildDirectory)/gopath' # Go workspace path
-      GOROOT: '$(Agent.BuildDirectory)/go' # Go installation path
-      GOBIN:  '$(GOPATH)/bin' # Go binaries path
-      GOMODULE: 'on'
-      modulePath: '$(Agent.BuildDirectory)/wails' # Path to the module's code
-    pool:
-      vmImage: 'Ubuntu-16.04'
-    environment: 'linux-dev'
-    strategy:
-      runOnce:
-        deploy:
-          steps:
-          - checkout: self  # self represents the repo where the initial Pipelines YAML file was found
-            clean: true  # whether to fetch clean each time
-            path: wails  # path to check out source code, relative to the agent's build directory (e.g. \_work\1)
-            # go version 1.12.7
-          - script: |
-              wget "https://storage.googleapis.com/golang/go1.12.7.linux-amd64.tar.gz" --output-document "$(Agent.BuildDirectory)/go1.12.7.tar.gz"
-              tar -C '$(Agent.BuildDirectory)' -xzf "$(Agent.BuildDirectory)/go1.12.7.tar.gz"
-            displayName: 'Install Go 1.12.7 Linux'
-          - script: |
-              mkdir -p '$(GOBIN)'
-              mkdir -p '$(GOPATH)/pkg'
-              mkdir -p '$(GOROOT)'
-              shopt -s extglob
-              shopt -s dotglob
-              echo '##vso[task.prependpath]$(GOBIN)'
-              echo '##vso[task.prependpath]$(GOROOT)/bin'
-            displayName: 'Set up the Go workspace'
-          - script: |
-              go version
-              go get -v -d ./...
-              cd cmd/wails
-              go install
-            workingDirectory: '$(modulePath)'
-            displayName: 'Get dependencies, then build'
-          - script: |
-              wails version
-            workingDirectory: '$(modulePath)'
-            displayName: 'Check we have output'
-
-  - deployment: Mac
-    displayName: Mac
-    variables:
-      GOPATH: '$(Agent.BuildDirectory)/gopath' # Go workspace path
-      GOROOT: '$(Agent.BuildDirectory)/go' # Go installation path
-      GOBIN:  '$(GOPATH)/bin' # Go binaries path
-      GOMODULE: 'on'
-      modulePath: '$(Agent.BuildDirectory)/wails' # Path to the module's code
-    pool:
-      vmImage: 'macOS-10.14'
-    environment: 'mac-dev'
-    strategy:
-      runOnce:
-        deploy:
-          steps:
-          - checkout: self  # self represents the repo where the initial Pipelines YAML file was found
-            clean: true  # whether to fetch clean each time
-            path: wails  # path to check out source code, relative to the agent's build directory (e.g. \_work\1)
-          # go version 1.12.7
-          - script: |
-              wget "https://storage.googleapis.com/golang/go1.12.7.darwin-amd64.tar.gz" --output-document "$(Agent.BuildDirectory)/go1.12.7.tar.gz"
-              tar -C '$(Agent.BuildDirectory)' -xzf "$(Agent.BuildDirectory)/go1.12.7.tar.gz"
-            displayName: 'Install Go 1.12.7 Linux'
-          - script: |
-              mkdir -p '$(GOBIN)'
-              mkdir -p '$(GOPATH)/pkg'
-              mkdir -p '$(GOROOT)'
-              shopt -s extglob
-              shopt -s dotglob
-              echo '##vso[task.prependpath]$(GOBIN)'
-              echo '##vso[task.prependpath]$(GOROOT)/bin'
-            displayName: 'Set up the Go workspace'
-          - script: |
-              go version
-              go get -v -d ./...
-              cd cmd/wails
-              go install
-            workingDirectory: '$(modulePath)'
-            displayName: 'Get dependencies, then build'
-          - script: |
-              wails version
-            workingDirectory: '$(modulePath)'
-            displayName: 'Check we have output'
-
-  - deployment: Win
-    displayName: Win
-    variables:
-      GOMODULE: 'on'
-      modulePath: '$(Agent.BuildDirectory)/wails' # Path to the module's code
-    pool:
-      vmImage: 'windows-2019'
-    environment: 'win-dev'
-    strategy:
-      runOnce:
-        deploy:
-          steps:
-          - checkout: self  # self represents the repo where the initial Pipelines YAML file was found
-            clean: true  # whether to fetch clean each time
-            path: wails  # path to check out source code, relative to the agent's build directory (e.g. \_work\1)
-          # Go tool installer
-          # Find in cache or download a specific version of Go and add it to the PATH
-          - task: GoTool@0
-            inputs:
-              version: '1.12.7' 
-              goPath: '$(Agent.BuildDirectory)/go'
-              goBin: '$(Agent.BuildDirectory)/go/bin'
-            displayName: 'Set up the Go workspace'
-          - script: |
-              go version
-              go get -v -d ./...
-              cd cmd/wails
-              go install
-            workingDirectory: '$(modulePath)'
-            displayName: 'Get dependencies, then build'
-          - script: |
-              wails version
-            workingDirectory: '$(Agent.BuildDirectory)/go/bin'
-            displayName: 'Check we have output'

cmd/helpers.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"strings"
 	"time"
 
 	"github.com/leaanthony/mewn"
@@ -88,17 +87,6 @@ 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)
 	}
@@ -115,7 +103,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	}
 
 	// Add windows flags
-	if runtime.GOOS == "windows" && buildMode == BuildModeProd {
+	if runtime.GOOS == "windows" {
 		ldflags += "-H windowsgui "
 	}
 
@@ -231,15 +219,6 @@ 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
@@ -296,7 +275,7 @@ func InstallRuntime(caller string, projectDir string, projectOptions *ProjectOpt
 // InstallBridge installs the relevant bridge javascript library
 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", "main.js")
 	err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
 	return err
 }
@@ -304,7 +283,7 @@ func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
 // InstallProdRuntime installs the production runtime
 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", "main.js")
 	err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
 	return err
 }

cmd/linux.go

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

cmd/linuxdb.yaml

@@ -146,27 +146,18 @@ distributions:
         version: default
         name: Arch Linux
         gccversioncommand: *gccdumpversion
-        programs: &archdefaultprograms
+        programs:
           - name: gcc
             help: Please install with `sudo pacman -S gcc` and try again
           - name: pkgconf
             help: Please install with `sudo pacman -S pkgconf` and try again
           - name: npm
             help: Please install with `sudo pacman -S npm` and try again
-        libraries: &archdefaultlibraries
+        libraries:
           - name: gtk3
             help: Please install with `sudo pacman -S gtk3` and try again
           - name: webkit2gtk
             help: Please install with `sudo pacman -S webkit2gtk` and try again
-  manjaro:
-    id: manjaro
-    releases:
-      default:
-        version: default
-        name: Manjaro Linux
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries
   gentoo:
     id: gentoo
     releases:

cmd/package.go

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

cmd/program.go

@@ -100,19 +100,6 @@ 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, " ")
@@ -128,7 +115,6 @@ 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,18 +13,6 @@ 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"`
@@ -165,23 +153,6 @@ 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

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

cmd/templates/angular-template/frontend/browserslist

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

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

@@ -6,7 +6,7 @@ import { environment } from './environments/environment';
 
 import 'zone.js'
 
-import * as Wails from '@wailsapp/runtime';
+import Wails from '@wailsapp/runtime';
 
 if (environment.production) {
   enableProdMode();

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

@@ -0,0 +1,17 @@
+/*
+    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/create-react-app/frontend/src/index.js

@@ -4,7 +4,7 @@ import 'core-js/stable';
 import './index.css';
 import App from './App';
 
-import * as Wails from '@wailsapp/runtime';
+import Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
   ReactDOM.render(<App />, document.getElementById('app'));

cmd/templates/create-react-app/frontend/src/wailsbridge.js

@@ -0,0 +1,17 @@
+/*
+    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/vuebasic/frontend/src/main.js

@@ -4,7 +4,7 @@ import App from './App.vue';
 Vue.config.productionTip = false;
 Vue.config.devtools = true;
 
-import * as Wails from '@wailsapp/runtime';
+import Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
 	new Vue({

cmd/templates/vuetify-basic/frontend/src/main.js

@@ -12,7 +12,7 @@ import App from './App.vue';
 Vue.config.productionTip = false;
 Vue.config.devtools = true;
 
-import * as Wails from '@wailsapp/runtime';
+import Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
 	new Vue({

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.18.14-pre"
+const Version = "v0.17.15-pre"

cmd/wails/15_migrate.go

@@ -1,408 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/Masterminds/semver"
-	"github.com/leaanthony/spinner"
-	"github.com/wailsapp/wails/cmd"
-)
-
-// Constants
-var checkSpinner = spinner.NewSpinner()
-var migrateProjectOptions = &cmd.ProjectOptions{}
-var migrateFS = cmd.NewFSHelper()
-var migrateGithub = cmd.NewGitHubHelper()
-var programHelper = cmd.NewProgramHelper()
-var lessThanV1 *semver.Constraints
-
-// The user's go.mod
-var goMod string
-var goModFile string
-
-// The user's main.js
-var mainJSFile string
-var mainJSContents string
-
-// Frontend directory
-var frontEndDir string
-
-func init() {
-
-	var dryrun bool
-	var err error
-
-	lessThanV1, err = semver.NewConstraint("< v1.0.0")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// var forceRebuild = false
-	checkSpinner.SetSpinSpeed(50)
-
-	commandDescription := `EXPERIMENTAL - This command attempts to migrate projects to the latest Wails version.`
-	updateCmd := app.Command("migrate", "Migrate projects to latest Wails release").
-		LongDescription(commandDescription).
-		BoolFlag("dryrun", "Only display what would be done", &dryrun)
-
-	updateCmd.Action(func() error {
-
-		message := "Migrate Project"
-		logger.PrintSmallBanner(message)
-		logger.Red("WARNING: This is an experimental command. Ensure you have backups of your project!")
-		logger.Red("It currently only supports npm based projects.")
-		fmt.Println()
-
-		// Check project directory
-		err := checkProjectDirectory()
-		if err != nil {
-			return err
-		}
-
-		// Find Wails version from go.mod
-		wailsVersion, err := getWailsVersion()
-		if err != nil {
-			return err
-		}
-
-		// Get latest stable version
-		var latestVersion *semver.Version
-		latestVersion, err = getLatestWailsVersion()
-		if err != nil {
-			return err
-		}
-
-		var canMigrate bool
-		canMigrate, err = canMigrateVersion(wailsVersion, latestVersion)
-		if err != nil {
-			return err
-		}
-
-		if !canMigrate {
-			return nil
-		}
-
-		// Check for wailsbridge
-		wailsBridge, err := checkWailsBridge()
-		if err != nil {
-			return err
-		}
-
-		// Is main.js using bridge.Init()
-		canUpdateMainJS, err := checkMainJS()
-		if err != nil {
-			return err
-		}
-
-		// TODO: Check if we are using legacy js runtime
-
-		// Operations
-		logger.Yellow("Operations to perform:")
-
-		logger.Yellowf("  - Update to Wails v%s\n", latestVersion)
-
-		if len(wailsBridge) > 0 {
-			logger.Yellow("  - Delete wailsbridge.js")
-		}
-
-		if canUpdateMainJS {
-			logger.Yellow("  - Patch main.js")
-		}
-
-		logger.Yellow("  - Ensure '@wailsapp/runtime` module is installed")
-
-		if dryrun {
-			logger.White("Exiting: Dry Run")
-			return nil
-		}
-
-		logger.Red("*WARNING* About to modify your project!")
-		logger.Red("Type 'YES' to continue: ")
-		scanner := bufio.NewScanner(os.Stdin)
-		scanner.Scan()
-		input := scanner.Text()
-		if input != "YES" {
-			logger.Red("ABORTED!")
-			return nil
-		}
-
-		logger.Yellow("Let's do this!")
-
-		err = updateWailsVersion(wailsVersion, latestVersion)
-		if err != nil {
-			return err
-		}
-
-		if len(wailsBridge) > 0 {
-			err = deleteWailsBridge(wailsBridge)
-			if err != nil {
-				return err
-			}
-		}
-
-		if canUpdateMainJS {
-			err = patchMainJS()
-			if err != nil {
-				return err
-			}
-		}
-
-		// Install runtime
-		err = installWailsRuntime()
-		if err != nil {
-			return err
-		}
-
-		fmt.Println()
-		logger.Yellow("Migration complete! Check project by running `wails build`.")
-		return nil
-	})
-}
-
-func checkProjectDirectory() error {
-	// Get versions
-	checkSpinner.Start("Check Project Directory")
-
-	// Check we are in project directory
-	err := migrateProjectOptions.LoadConfig(migrateFS.Cwd())
-	if err != nil {
-		checkSpinner.Error()
-		return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
-	}
-
-	checkSpinner.Success()
-	return nil
-}
-
-func getWailsVersion() (*semver.Version, error) {
-	checkSpinner.Start("Get Wails Version")
-	var result *semver.Version
-
-	// Load file
-	var err error
-	goModFile, err = filepath.Abs(filepath.Join(".", "go.mod"))
-	if err != nil {
-		checkSpinner.Error()
-		return nil, fmt.Errorf("Unable to load go.mod at %s", goModFile)
-	}
-	goMod, err = migrateFS.LoadAsString(goModFile)
-	if err != nil {
-		checkSpinner.Error()
-		return nil, fmt.Errorf("Unable to load go.mod")
-	}
-
-	// Find wails version
-	versionRegexp := regexp.MustCompile(`.*github.com/wailsapp/wails.*(v\d+.\d+.\d+)`)
-	versions := versionRegexp.FindStringSubmatch(goMod)
-
-	if len(versions) != 2 {
-		return nil, fmt.Errorf("Unable to determine Wails version")
-	}
-
-	version := versions[1]
-	result, err = semver.NewVersion(version)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to parse Wails version: %s", version)
-	}
-	checkSpinner.Success("Found Wails Version: " + version)
-	return result, nil
-
-}
-
-func canMigrateVersion(wailsVersion *semver.Version, latestVersion *semver.Version) (bool, error) {
-	checkSpinner.Start("Checking ability to Migrate")
-
-	// Check if we are at the latest version!!!!
-	if wailsVersion.Equal(latestVersion) || wailsVersion.GreaterThan(latestVersion) {
-		checkSpinner.Errorf("Checking ability to Migrate: No! (v%s >= v%s)", wailsVersion, latestVersion)
-		return false, nil
-	}
-
-	// Check for < v1.0.0
-	if lessThanV1.Check(wailsVersion) {
-		checkSpinner.Successf("Checking ability to Migrate: Yes! (v%s < v1.0.0)", wailsVersion)
-		return true, nil
-	}
-	checkSpinner.Error("Unable to migrate")
-	return false, fmt.Errorf("No migration rules for version %s", wailsVersion)
-}
-
-func checkWailsBridge() (string, error) {
-	checkSpinner.Start("Checking if legacy Wails Bridge present")
-
-	// Check frontend dir is available
-	if migrateProjectOptions.FrontEnd == nil ||
-		len(migrateProjectOptions.FrontEnd.Dir) == 0 ||
-		!migrateFS.DirExists(migrateProjectOptions.FrontEnd.Dir) {
-		checkSpinner.Error("Unable to determine frontend directory")
-		return "", fmt.Errorf("Unable to determine frontend directory")
-	}
-
-	frontEndDir = migrateProjectOptions.FrontEnd.Dir
-
-	wailsBridgePath, err := filepath.Abs(filepath.Join(".", frontEndDir, "src", "wailsbridge.js"))
-	if err != nil {
-		checkSpinner.Error(err.Error())
-		return "", err
-	}
-
-	// If it doesn't exist, return blank string
-	if !migrateFS.FileExists(wailsBridgePath) {
-		checkSpinner.Success("Checking if legacy Wails Bridge present: No")
-		return "", nil
-	}
-
-	checkSpinner.Success("Checking if legacy Wails Bridge present: Yes")
-	return wailsBridgePath, nil
-
-}
-
-// This function determines if the main.js file using wailsbridge can be auto-updated
-func checkMainJS() (bool, error) {
-
-	checkSpinner.Start("Checking if main.js can be migrated")
-	var err error
-
-	// Check main.js is there
-	if migrateProjectOptions.FrontEnd == nil ||
-		len(migrateProjectOptions.FrontEnd.Dir) == 0 ||
-		!migrateFS.DirExists(migrateProjectOptions.FrontEnd.Dir) {
-		checkSpinner.Error("Unable to determine frontend directory")
-		return false, fmt.Errorf("Unable to determine frontend directory")
-	}
-
-	frontEndDir = migrateProjectOptions.FrontEnd.Dir
-
-	mainJSFile, err = filepath.Abs(filepath.Join(".", frontEndDir, "src", "main.js"))
-	if err != nil {
-		checkSpinner.Error("Unable to find main.js")
-		return false, err
-	}
-
-	mainJSContents, err = migrateFS.LoadAsString(mainJSFile)
-	if err != nil {
-		checkSpinner.Error("Unable to load main.js")
-		return false, err
-	}
-
-	// Check we have a line like: import Bridge from "./wailsbridge";
-	if strings.Index(mainJSContents, `import Bridge from "./wailsbridge";`) == -1 {
-		checkSpinner.Success("Checking if main.js can be migrated: No - Cannot find `import Bridge`")
-		return false, nil
-	}
-
-	// Check we have a line like: Bridge.Start(() => {
-	if strings.Index(mainJSContents, `Bridge.Start(`) == -1 {
-		checkSpinner.Success("Checking if main.js can be migrated: No - Cannot find `Bridge.Start`")
-		return false, nil
-	}
-	checkSpinner.Success("Checking if main.js can be migrated: Yes")
-	return true, nil
-}
-
-func getLatestWailsVersion() (*semver.Version, error) {
-	checkSpinner.Start("Checking GitHub for latest Wails version")
-	version, err := migrateGithub.GetLatestStableRelease()
-	if err != nil {
-		checkSpinner.Error("Checking GitHub for latest Wails version: Failed")
-		return nil, err
-	}
-
-	checkSpinner.Successf("Checking GitHub for latest Wails version: v%s", version)
-	return version.Version, nil
-}
-
-func updateWailsVersion(currentVersion, latestVersion *semver.Version) error {
-	// Patch go.mod
-	checkSpinner.Start("Patching go.mod")
-
-	wailsModule := "github.com/wailsapp/wails"
-	old := fmt.Sprintf("%s v%s", wailsModule, currentVersion)
-	new := fmt.Sprintf("%s v%s", wailsModule, latestVersion)
-
-	goMod = strings.Replace(goMod, old, new, -1)
-	err := ioutil.WriteFile(goModFile, []byte(goMod), 0600)
-	if err != nil {
-		checkSpinner.Error()
-		return err
-	}
-
-	checkSpinner.Success()
-	return nil
-}
-
-func deleteWailsBridge(bridgeFilename string) error {
-	// Patch go.mod
-	checkSpinner.Start("Delete legacy wailsbridge.js")
-
-	err := migrateFS.RemoveFile(bridgeFilename)
-	if err != nil {
-		checkSpinner.Error()
-		return err
-	}
-
-	checkSpinner.Success()
-	return nil
-}
-
-func patchMainJS() error {
-	// Patch main.js
-	checkSpinner.Start("Patching main.js")
-
-	// Patch import line
-	oldImportLine := `import Bridge from "./wailsbridge";`
-	newImportLine := `import * as Wails from "@wailsapp/runtime";`
-	mainJSContents = strings.Replace(mainJSContents, oldImportLine, newImportLine, -1)
-
-	// Patch Start line
-	oldStartLine := `Bridge.Start`
-	newStartLine := `Wails.Init`
-	mainJSContents = strings.Replace(mainJSContents, oldStartLine, newStartLine, -1)
-
-	err := ioutil.WriteFile(mainJSFile, []byte(mainJSContents), 0600)
-	if err != nil {
-		checkSpinner.Error()
-		return err
-	}
-
-	checkSpinner.Success()
-	return nil
-}
-
-func installWailsRuntime() error {
-
-	checkSpinner.Start("Installing @wailsapp/runtime module")
-
-	// Change to the frontend directory
-	err := os.Chdir(frontEndDir)
-	if err != nil {
-		checkSpinner.Error()
-		return nil
-	}
-
-	// Determine package manager
-	packageManager, err := migrateProjectOptions.GetNPMBinaryName()
-	if err != nil {
-		checkSpinner.Error()
-		return nil
-	}
-
-	switch packageManager {
-	case cmd.NPM:
-		// npm install --save @wailsapp/runtime
-		programHelper.InstallNPMPackage("@wailsapp/runtime", true)
-	default:
-		checkSpinner.Error()
-		return fmt.Errorf("Unknown package manager")
-	}
-
-	checkSpinner.Success()
-	return nil
-}

cmd/wails/9_issue.go

@@ -80,16 +80,15 @@ To help you in this process, we will ask for some information, add Go/Wails deta
 		npm := program.FindProgram("npm")
 		if npm != nil {
 			stdout, _, _, _ := npm.Run("--version")
-			npmVersion = stdout
-			npmVersion = npmVersion[:len(npmVersion)-1]
-			npmVersion = strings.TrimSpace(npmVersion)
+			nodeVersion = stdout
+			nodeVersion = nodeVersion[:len(nodeVersion)-1]
 		}
 
 		node := program.FindProgram("node")
 		if node != nil {
 			stdout, _, _, _ := node.Run("--version")
-			nodeVersion = stdout
-			nodeVersion = nodeVersion[:len(nodeVersion)-1]
+			npmVersion = stdout
+			npmVersion = npmVersion[:len(npmVersion)-1]
 		}
 
 		str.WriteString("\n| Name   | Value |\n| ----- | ----- |\n")

cmd/wails/main.go

@@ -1,9 +1,6 @@
 package main
 
 import (
-	"os"
-	"os/exec"
-
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -18,9 +15,5 @@ func main() {
 	err := app.Run()
 	if err != nil {
 		logger.Error(err.Error())
-		if exitErr, ok := err.(*exec.ExitError); ok {
-			os.Exit(exitErr.ExitCode())
-		}
-		os.Exit(1)
 	}
 }

cmd/windres.bat

@@ -1 +0,0 @@
-windres.exe -o %1 %2

config.go

@@ -1,9 +1,6 @@
 package wails
 
-import (
-	"github.com/leaanthony/mewn"
-	"github.com/wailsapp/wails/runtime"
-)
+import "github.com/leaanthony/mewn"
 
 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
@@ -68,7 +65,7 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.CSS = in.CSS
 	}
 	if in.Title != "" {
-		a.Title = runtime.ProcessEncoding(in.Title)
+		a.Title = in.Title
 	}
 
 	if in.Colour != "" {
@@ -94,12 +91,12 @@ func (a *AppConfig) merge(in *AppConfig) error {
 // Creates the default configuration
 func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 	result := &AppConfig{
-		Width:       800,
-		Height:      600,
-		Resizable:   true,
-		Title:       "My Wails App",
-		Colour:      "#FFF", // White by default
-		defaultHTML: mewn.String("./runtime/assets/default.html"),
+		Width:     800,
+		Height:    600,
+		Resizable: true,
+		Title:     "My Wails App",
+		Colour:    "#FFF", // White by default
+		HTML:      mewn.String("./runtime/assets/default.html"),
 	}
 
 	if userConfig != nil {

go.mod

@@ -2,7 +2,6 @@ module github.com/wailsapp/wails
 
 require (
 	github.com/Masterminds/semver v1.4.2
-	github.com/abadojack/whatlanggo v1.0.1
 	github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc // indirect
 	github.com/dchest/htmlmin v0.0.0-20150526090704-e254725e81ac
 	github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947 // indirect
@@ -23,11 +22,9 @@ require (
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/sirupsen/logrus v1.4.1
 	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/net v0.0.0-20190509222800-a4d6f7feada5 // indirect
 	golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862
-	golang.org/x/text v0.3.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )

go.sum

@@ -2,8 +2,6 @@ github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITg
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
 github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
-github.com/abadojack/whatlanggo v1.0.1 h1:19N6YogDnf71CTHm3Mp2qhYfkRdyvbgwWdd2EPxJRG4=
-github.com/abadojack/whatlanggo v1.0.1/go.mod h1:66WiQbSbJBIlOZMsvbKe5m6pzQovxCH9B/K8tQB2uoc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -70,8 +68,6 @@ github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba h1:2DHfQOxcpWdGf5q5IzCUFPNvRX9Icf+09RvQK2VnJq0=
-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-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk=
@@ -87,7 +83,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862 h1:rM0ROo5vb9AdYJi1110yjWGMej9ITfKddS89P3Fkhug=
 golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 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/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA=

lib/binding/manager.go

@@ -16,7 +16,6 @@ type Manager struct {
 	functions        map[string]*boundFunction
 	internalMethods  *internalMethods
 	initMethods      []*boundMethod
-	shutdownMethods  []*boundMethod
 	log              *logger.CustomLogger
 	renderer         interfaces.Renderer
 	runtime          interfaces.Runtime // The runtime object to pass to bound structs
@@ -128,9 +127,6 @@ func (b *Manager) bindMethod(object interface{}) error {
 		if newMethod.isWailsInit {
 			b.log.Debugf("Detected WailsInit function: %s", fullMethodName)
 			b.initMethods = append(b.initMethods, newMethod)
-		} else if newMethod.isWailsShutdown {
-			b.log.Debugf("Detected WailsShutdown function: %s", fullMethodName)
-			b.shutdownMethods = append(b.shutdownMethods, newMethod)
 		} else {
 			// Save boundMethod
 			b.log.Infof("Bound Method: %s()", fullMethodName)
@@ -296,13 +292,3 @@ func (b *Manager) callWailsInitMethods() error {
 	}
 	return nil
 }
-
-// Shutdown the binding manager
-func (b *Manager) Shutdown() {
-	b.log.Debug("Shutdown called")
-	for _, method := range b.shutdownMethods {
-		b.log.Debugf("Calling Shutdown for method: %s", method.fullName)
-		method.call("[]")
-	}
-	b.log.Debug("Shutdown complete")
-}

lib/binding/method.go

@@ -18,7 +18,6 @@ type boundMethod struct {
 	log                *logger.CustomLogger
 	hasErrorReturnType bool // Indicates if there is an error return type
 	isWailsInit        bool
-	isWailsShutdown    bool
 }
 
 // Creates a new bound method based on the given method + type
@@ -40,11 +39,6 @@ func newBoundMethod(name string, fullName string, method reflect.Value, objectTy
 		err = result.processWailsInit()
 	}
 
-	// Are we a WailsShutdown method?
-	if result.Name == "WailsShutdown" {
-		err = result.processWailsShutdown()
-	}
-
 	return result, err
 }
 
@@ -217,20 +211,3 @@ func (b *boundMethod) processWailsInit() error {
 
 	return nil
 }
-
-func (b *boundMethod) processWailsShutdown() error {
-	// We must have only 1 input, it must be *wails.Runtime
-	if len(b.inputs) != 0 {
-		return fmt.Errorf("Invalid WailsShutdown() definition. Expected 0 inputs, but got %d", len(b.inputs))
-	}
-
-	// We must have only 1 output, it must be error
-	if len(b.returnTypes) != 0 {
-		return fmt.Errorf("Invalid WailsShutdown() definition. Expected 0 return types, but got %d", len(b.returnTypes))
-	}
-
-	// We are indeed a wails Shutdown method
-	b.isWailsShutdown = true
-
-	return nil
-}

lib/event/manager.go

@@ -3,21 +3,18 @@ package event
 import (
 	"fmt"
 	"sync"
-	"time"
-
-	"github.com/wailsapp/wails/lib/interfaces"
 	"github.com/wailsapp/wails/lib/logger"
 	"github.com/wailsapp/wails/lib/messages"
+	"github.com/wailsapp/wails/lib/interfaces"
 )
 
 // Manager handles and processes events
 type Manager struct {
 	incomingEvents chan *messages.EventData
 	listeners      map[string][]*eventListener
-	running        bool
+	exit           bool
 	log            *logger.CustomLogger
 	renderer       interfaces.Renderer // Messages will be dispatched to the frontend
-	wg             sync.WaitGroup
 }
 
 // NewManager creates a new event manager with a 100 event buffer
@@ -25,7 +22,7 @@ func NewManager() interfaces.EventManager {
 	return &Manager{
 		incomingEvents: make(chan *messages.EventData, 100),
 		listeners:      make(map[string][]*eventListener),
-		running:        false,
+		exit:           false,
 		log:            logger.NewCustomLogger("Events"),
 	}
 }
@@ -90,14 +87,15 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 	// Store renderer
 	e.renderer = renderer
 
-	// Set up waitgroup so we can wait for goroutine to quit
-	e.running = true
-	e.wg.Add(1)
+	// Set up waitgroup so we can wait for goroutine to start
+	var wg sync.WaitGroup
+	wg.Add(1)
 
 	// Run main loop in separate goroutine
 	go func() {
+		wg.Done()
 		e.log.Info("Listening")
-		for e.running {
+		for e.exit == false {
 			// TODO: Listen for application exit
 			select {
 			case event := <-e.incomingEvents:
@@ -141,18 +139,14 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 						}
 					}
 				}
-			default:
-				time.Sleep(1 * time.Millisecond)
 			}
 		}
-		e.wg.Done()
 	}()
+
+	// Wait for goroutine to start
+	wg.Wait()
 }
 
-// Shutdown is called when exiting the Application
-func (e *Manager) Shutdown() {
-	e.log.Debug("Shutting Down")
-	e.running = false
-	e.log.Debug("Waiting for main loop to exit")
-	e.wg.Wait()
+func (e *Manager) stop() {
+	e.exit = true
 }

lib/interfaces/bindingmanager.go

@@ -7,5 +7,4 @@ type BindingManager interface {
 	Bind(object interface{})
 	Start(renderer Renderer, runtime Runtime) error
 	ProcessCall(callData *messages.CallData) (result interface{}, err error)
-	Shutdown()
 }

lib/interfaces/eventmanager.go

@@ -8,5 +8,4 @@ type EventManager interface {
 	Emit(eventName string, optionalData ...interface{})
 	On(eventName string, callback func(...interface{}))
 	Start(Renderer)
-	Shutdown()
 }

lib/interfaces/ipcmanager.go

@@ -5,5 +5,4 @@ type IPCManager interface {
 	BindRenderer(Renderer)
 	Dispatch(message string)
 	Start(eventManager EventManager, bindingManager BindingManager)
-	Shutdown()
 }

lib/interfaces/renderer.go

@@ -3,12 +3,10 @@ package interfaces
 import (
 	"github.com/wailsapp/wails/lib/messages"
 )
-
 // Renderer is an interface describing a Wails target to render the app to
 type Renderer interface {
 	Initialise(AppConfig, IPCManager, EventManager) error
 	Run() error
-	EnableDebug()
 
 	// Binding
 	NewBinding(bindingName string) error

lib/ipc/manager.go

@@ -2,8 +2,6 @@ package ipc
 
 import (
 	"fmt"
-	"sync"
-	"time"
 
 	"github.com/wailsapp/wails/lib/interfaces"
 	"github.com/wailsapp/wails/lib/logger"
@@ -14,20 +12,18 @@ import (
 type Manager struct {
 	renderer     interfaces.Renderer // The renderer
 	messageQueue chan *ipcMessage
-	quitChannel  chan struct{}
+	// quitChannel  chan struct{}
 	// signals      chan os.Signal
 	log            *logger.CustomLogger
 	eventManager   interfaces.EventManager
 	bindingManager interfaces.BindingManager
-	running        bool
-	wg             sync.WaitGroup
 }
 
 // NewManager creates a new IPC Manager
 func NewManager() interfaces.IPCManager {
 	result := &Manager{
 		messageQueue: make(chan *ipcMessage, 100),
-		quitChannel:  make(chan struct{}),
+		// 		quitChannel:  make(chan struct{}),
 		// 		signals:      make(chan os.Signal, 1),
 		log: logger.NewCustomLogger("IPC"),
 	}
@@ -48,12 +44,9 @@ func (i *Manager) Start(eventManager interfaces.EventManager, bindingManager int
 
 	i.log.Info("Starting")
 	// signal.Notify(manager.signals, os.Interrupt)
-	i.running = true
-
-	// Keep track of this goroutine
-	i.wg.Add(1)
 	go func() {
-		for i.running {
+		running := true
+		for running {
 			select {
 			case incomingMessage := <-i.messageQueue:
 				i.log.DebugFields("Processing message", logger.Fields{
@@ -124,12 +117,15 @@ func (i *Manager) Start(eventManager interfaces.EventManager, bindingManager int
 				i.log.DebugFields("Finished processing message", logger.Fields{
 					"1D": &incomingMessage,
 				})
-			default:
-				time.Sleep(1 * time.Millisecond)
+				// 			case <-manager.quitChannel:
+				// 				Debug("[MessageQueue] Quit caught")
+				// 				running = false
+				// 			case <-manager.signals:
+				// 				Debug("[MessageQueue] Signal caught")
+				// 				running = false
 			}
 		}
 		i.log.Debug("Stopping")
-		i.wg.Done()
 	}()
 }
 
@@ -171,11 +167,3 @@ func (i *Manager) SendResponse(response *ipcResponse) error {
 	// Call back to the front end
 	return i.renderer.Callback(data)
 }
-
-// Shutdown is called when exiting the Application
-func (i *Manager) Shutdown() {
-	i.log.Debug("Shutdown called")
-	i.running = false
-	i.log.Debug("Waiting of main loop shutdown")
-	i.wg.Wait()
-}

lib/renderer/bridge.go

@@ -48,9 +48,6 @@ type Bridge struct {
 
 	// Mutex for writing to the socket
 	lock sync.Mutex
-
-	// debug
-	debug bool
 }
 
 // Initialise the Bridge Renderer
@@ -77,11 +74,6 @@ func (h *Bridge) evalJS(js string, mtype messageType) error {
 	return nil
 }
 
-// EnableDebug enables debug!
-func (h *Bridge) EnableDebug() {
-	h.debug = true
-}
-
 func (h *Bridge) injectCSS(css string) {
 	// Minify css to overcome issues in the browser with carriage returns
 	minified, err := htmlmin.Minify([]byte(css), &htmlmin.Options{
@@ -125,6 +117,7 @@ func (h *Bridge) sendMessage(conn *websocket.Conn, msg string) {
 
 func (h *Bridge) start(conn *websocket.Conn) {
 
+	// set external.invoke
 	h.log.Infof("Connected to frontend.")
 
 	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
@@ -163,7 +156,7 @@ func (h *Bridge) Run() error {
 	h.log.Info("The frontend will connect automatically.")
 
 	err := h.server.ListenAndServe()
-	if err != nil && err != http.ErrServerClosed {
+	if err != nil {
 		h.log.Fatal(err.Error())
 	}
 	return err
@@ -257,9 +250,5 @@ func (h *Bridge) SetTitle(title string) {
 // Close is unsupported for Bridge but required
 // for the Renderer interface
 func (h *Bridge) Close() {
-	h.log.Debug("Shutting down")
-	err := h.server.Close()
-	if err != nil {
-		h.log.Errorf(err.Error())
-	}
+	h.log.Warn("Close() unsupported in bridge mode")
 }

lib/renderer/webview.go

@@ -25,7 +25,6 @@ type WebView struct {
 	config       interfaces.AppConfig
 	eventManager interfaces.EventManager
 	bindingCache []string
-	debug        bool
 }
 
 // NewWebView returns a new WebView struct
@@ -49,22 +48,13 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 	// Save the config
 	w.config = config
 
-	// defaulthtml
-	HTML := config.GetDefaultHTML()
-	if len(HTML) == 0 {
-		HTML = mewn.String("../../runtime/assets/default.html")
-	}
-
-	HTML = fmt.Sprintf("data:text/html,%s", HTML)
-	fmt.Printf("*** %s ***", HTML)
-	w.log.Infof("URL: %s", HTML)
 	// Create the WebView instance
 	w.window = wv.NewWebview(wv.Settings{
 		Width:     config.GetWidth(),
 		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
-		URL:       HTML,
+		URL:       config.GetDefaultHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message)
@@ -105,7 +95,6 @@ func (w *WebView) evalJS(js string) error {
 	if len(js) > 45 {
 		outputJS += "..."
 	}
-	// var outputJS = js
 	w.log.DebugFields("Eval", logger.Fields{"js": outputJS})
 	//
 	w.window.Dispatch(func() {
@@ -114,11 +103,6 @@ func (w *WebView) evalJS(js string) error {
 	return nil
 }
 
-// EnableDebug enables debug!
-func (w *WebView) EnableDebug() {
-	w.debug = true
-}
-
 // Escape the Javascripts!
 func escapeJS(js string) (string, error) {
 	result := strings.Replace(js, "\\", "\\\\", -1)
@@ -188,58 +172,51 @@ func (w *WebView) Run() error {
 
 	w.log.Info("Running...")
 
-	// Inject firebug in debug mode on Windows
-	if w.debug {
-		w.log.Debug("Injecting firebug")
-		// firebugLite := mewn.String("../../runtime/assets/injectFirebug.js")
-		// w.evalJS(firebugLite)
-	}
+	// Runtime assets
+	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	w.evalJS(wailsRuntime)
 
-	// // Runtime assets
-	// wailsRuntime := mewn.String("../../runtime/assets/wails.js")
-	// w.evalJS(wailsRuntime)
+	// Ping the wait channel when the wails runtime is loaded
+	w.eventManager.On("wails:loaded", func(...interface{}) {
 
-	// // Ping the wait channel when the wails runtime is loaded
-	// w.eventManager.On("wails:loaded", func(...interface{}) {
+		// Run this in a different go routine to free up the main process
+		go func() {
 
-	// 	// Run this in a different go routine to free up the main process
-	// 	go func() {
+			// Inject Bindings
+			for _, binding := range w.bindingCache {
+				w.evalJSSync(binding)
+			}
 
-	// 		// Inject Bindings
-	// 		for _, binding := range w.bindingCache {
-	// 			w.evalJSSync(binding)
-	// 		}
+			// Inject user CSS
+			if w.config.GetCSS() != "" {
+				outputCSS := fmt.Sprintf("%.45s", w.config.GetCSS())
+				if len(outputCSS) > 45 {
+					outputCSS += "..."
+				}
+				w.log.DebugFields("Inject User CSS", logger.Fields{"css": outputCSS})
+				w.injectCSS(w.config.GetCSS())
+			} else {
+				// Use default wails css
+				w.log.Debug("Injecting Default Wails CSS")
+				defaultCSS := mewn.String("../../runtime/assets/wails.css")
 
-	// 		// Inject user CSS
-	// 		if w.config.GetCSS() != "" {
-	// 			outputCSS := fmt.Sprintf("%.45s", w.config.GetCSS())
-	// 			if len(outputCSS) > 45 {
-	// 				outputCSS += "..."
-	// 			}
-	// 			w.log.DebugFields("Inject User CSS", logger.Fields{"css": outputCSS})
-	// 			w.injectCSS(w.config.GetCSS())
-	// 		} else {
-	// 			// Use default wails css
-	// 			w.log.Debug("Injecting Default Wails CSS")
-	// 			defaultCSS := mewn.String("../../runtime/assets/wails.css")
+				w.injectCSS(defaultCSS)
+			}
 
-	// 			w.injectCSS(defaultCSS)
-	// 		}
+			// Inject user JS
+			if w.config.GetJS() != "" {
+				outputJS := fmt.Sprintf("%.45s", w.config.GetJS())
+				if len(outputJS) > 45 {
+					outputJS += "..."
+				}
+				w.log.DebugFields("Inject User JS", logger.Fields{"js": outputJS})
+				w.evalJSSync(w.config.GetJS())
+			}
 
-	// 		// Inject user JS
-	// 		if w.config.GetJS() != "" {
-	// 			outputJS := fmt.Sprintf("%.45s", w.config.GetJS())
-	// 			if len(outputJS) > 45 {
-	// 				outputJS += "..."
-	// 			}
-	// 			w.log.DebugFields("Inject User JS", logger.Fields{"js": outputJS})
-	// 			w.evalJSSync(w.config.GetJS())
-	// 		}
-
-	// 		// Emit that everything is loaded and ready
-	// 		w.eventManager.Emit("wails:ready")
-	// 	}()
-	// })
+			// Emit that everything is loaded and ready
+			w.eventManager.Emit("wails:ready")
+		}()
+	})
 
 	// Kick off main window loop
 	w.window.Run()

lib/renderer/webview/webview.go

@@ -1,5 +1,6 @@
-// Package webview implements Go bindings to https://github.com/zserge/webview C library.
+// Package wails implements Go bindings to https://github.com/zserge/webview C library.
 // It is a modified version of webview.go from that repository
+
 // Bindings closely repeat the C APIs and include both, a simplified
 // single-function API to just open a full-screen webview window, and a more
 // advanced and featureful set of APIs, including Go-to-JavaScript bindings.
@@ -10,10 +11,10 @@
 package webview
 
 /*
-#cgo linux openbsd freebsd CFLAGS: -DWEBVIEW_GTK=1 -Wno-deprecated-declarations
+#cgo linux openbsd freebsd CFLAGS: -DWEBVIEW_GTK=1
 #cgo linux openbsd freebsd pkg-config: gtk+-3.0 webkit2gtk-4.0
 
-#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1 -std=c99 -DUNICODE=1 -D_UNICODE=1
+#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1
 #cgo windows LDFLAGS: -lole32 -lcomctl32 -loleaut32 -luuid -lgdi32
 
 #cgo darwin CFLAGS: -DWEBVIEW_COCOA=1 -x objective-c

lib/renderer/webview/webview.h

@@ -58,7 +58,6 @@ extern "C"
 #elif defined(WEBVIEW_WINAPI)
 #define CINTERFACE
 #include <windows.h>
-#include <tchar.h>
 
 #include <commctrl.h>
 #include <exdisp.h>
@@ -87,7 +86,7 @@ struct webview_priv
   NSAutoreleasePool *pool;
   NSWindow *window;
   WebView *webview;
-  id delegate;
+  id windowDelegate;
   int should_exit;
 };
 #else
@@ -1039,7 +1038,7 @@ struct webview_priv
     return S_FALSE;
   }
 
-  static const TCHAR *classname = TEXT("WebView");
+  static const TCHAR *classname = "WebView";
   static const SAFEARRAYBOUND ArrayBound = {1, 0};
 
   static IOleClientSiteVtbl MyIOleClientSiteTable = {
@@ -1228,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)
@@ -1238,9 +1237,9 @@ struct webview_priv
         myURL.bstrVal = SysAllocString(buffer);
         GlobalFree(buffer);
       }
-// #else
-//       myURL.bstrVal = SysAllocString(webPageName);
-// #endif
+#else
+      myURL.bstrVal = SysAllocString(webPageName);
+#endif
       if (!myURL.bstrVal)
       {
       badalloc:
@@ -1278,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)
@@ -1288,9 +1287,9 @@ struct webview_priv
                 bstr = SysAllocString(buffer);
                 GlobalFree(buffer);
               }
-// #else
-//               bstr = SysAllocString(url);
-// #endif
+#else
+              bstr = SysAllocString(string);
+#endif
               if ((pVar->bstrVal = bstr))
               {
                 htmlDoc2->lpVtbl->write(htmlDoc2, sfArray);
@@ -1351,8 +1350,8 @@ struct webview_priv
   }
 
 #define WEBVIEW_KEY_FEATURE_BROWSER_EMULATION \
-  _T("Software\\Microsoft\\Internet "            \
-  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION")
+  "Software\\Microsoft\\Internet "            \
+  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION"
 
   static int webview_fix_ie_compat_mode()
   {
@@ -1364,7 +1363,7 @@ struct webview_priv
     {
       return -1;
     }
-    for (p = &appname[_tcslen(appname) - 1]; p != appname && *p != _T('\\'); p--)
+    for (p = &appname[strlen(appname) - 1]; p != appname && *p != '\\'; p--)
     {
     }
     p++;
@@ -1405,7 +1404,6 @@ struct webview_priv
     {
       return -1;
     }
-
     ZeroMemory(&wc, sizeof(WNDCLASSEX));
     wc.cbSize = sizeof(WNDCLASSEX);
     wc.hInstance = hInstance;
@@ -1433,24 +1431,10 @@ struct webview_priv
     rect.bottom = rect.bottom - rect.top + top;
     rect.top = top;
 
-#ifdef UNICODE
-    wchar_t *u16title = webview_to_utf16(w->title);
-    if (u16title == NULL)
-    {
-      return -1;
-    }
-
     w->priv.hwnd =
-        CreateWindowEx(0, classname, u16title, style, rect.left, rect.top,
-                       rect.right - rect.left, rect.bottom - rect.top,
-                       HWND_DESKTOP, NULL, hInstance, (void *)w);
-#else
-  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();
@@ -1461,14 +1445,7 @@ struct webview_priv
 
     DisplayHTMLPage(w);
 
-#ifdef UNICODE
-    SetWindowText(w->priv.hwnd, u16title);
-    GlobalFree(u16title);
-#else
     SetWindowText(w->priv.hwnd, w->title);
-#endif
-    
-    
     ShowWindow(w->priv.hwnd, SW_SHOWDEFAULT);
     UpdateWindow(w->priv.hwnd);
     SetFocus(w->priv.hwnd);
@@ -1604,20 +1581,9 @@ struct webview_priv
 
   WEBVIEW_API void webview_set_title(struct webview *w, const char *title)
   {
-  #ifdef UNICODE
-    wchar_t *u16title = webview_to_utf16(title);
-    if (u16title == NULL)
-    {
-      return;
-    }
-    SetWindowText(w->priv.hwnd, u16title);
-    GlobalFree(u16title);
-  #else
     SetWindowText(w->priv.hwnd, title);
-  #endif
   }
 
-
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     if (w->priv.is_fullscreen == !!fullscreen)
@@ -1873,30 +1839,14 @@ struct webview_priv
         type |= MB_ICONERROR;
         break;
       }
-  #ifdef UNICODE
-      WCHAR *wtitle = webview_to_utf16(title);
-      WCHAR *warg = webview_to_utf16(arg);
-      MessageBox(w->priv.hwnd, warg, wtitle, type);
-      GlobalFree(warg);
-      GlobalFree(wtitle);
-  #else
       MessageBox(w->priv.hwnd, arg, title, type);
-  #endif
 #endif
     }
   }
 
   WEBVIEW_API void webview_terminate(struct webview *w) { PostQuitMessage(0); }
   WEBVIEW_API void webview_exit(struct webview *w) { OleUninitialize(); }
-  WEBVIEW_API void webview_print_log(const char *s) {
-  #ifdef UNICODE
-    WCHAR *ws = webview_to_utf16(s);
-    OutputDebugString(ws); 
-    GlobalFree(ws);
-  #else
-    OutputDebugString(s); 
-  #endif
-  }
+  WEBVIEW_API void webview_print_log(const char *s) { OutputDebugString(s); }
 
 #endif /* WEBVIEW_WINAPI */
 
@@ -1944,22 +1894,6 @@ struct webview_priv
     [script setValue:self forKey:@"external"];
   }
 
-static void webview_run_input_open_panel(id self, SEL cmd, id webview,
-                                           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);
-    if (strlen(filename)) {
-      [listener chooseFilename:[NSString stringWithUTF8String:filename]];
-    } else {
-      [listener cancel];
-    }
-  }
-
-
   static void webview_external_invoke(id self, SEL cmd, id arg)
   {
     struct webview *w =
@@ -1993,17 +1927,12 @@ static void webview_run_input_open_panel(id self, SEL cmd, id webview,
     class_addMethod(webViewDelegateClass,
                     sel_registerName("webView:didClearWindowObject:forFrame:"),
                     (IMP)webview_did_clear_window_object, "v@:@@@");
-    class_addMethod(
-        webViewDelegateClass,
-        sel_registerName("webView:runOpenPanelForFileButtonWithResultListener:"
-                         "allowMultipleFiles:"),
-        (IMP)webview_run_input_open_panel, "v@:@@c");
     class_addMethod(webViewDelegateClass, sel_registerName("invoke:"),
                     (IMP)webview_external_invoke, "v@:@");
     objc_registerClassPair(webViewDelegateClass);
 
-    w->priv.delegate = [[webViewDelegateClass alloc] init];
-    objc_setAssociatedObject(w->priv.delegate, "webview", (id)(w),
+    w->priv.windowDelegate = [[webViewDelegateClass alloc] init];
+    objc_setAssociatedObject(w->priv.windowDelegate, "webview", (id)(w),
                              OBJC_ASSOCIATION_ASSIGN);
 
     NSRect r = NSMakeRect(0, 0, w->width, w->height);
@@ -2031,7 +1960,7 @@ static void webview_run_input_open_panel(id self, SEL cmd, id webview,
     NSString *nsTitle = [NSString stringWithUTF8String:w->title];
     [w->priv.window setTitle:nsTitle];
 
-    [w->priv.window setDelegate:w->priv.delegate];
+    [w->priv.window setDelegate:w->priv.windowDelegate];
     [w->priv.window center];
 
     //  NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier:@"wat"];
@@ -2060,8 +1989,7 @@ static void webview_run_input_open_panel(id self, SEL cmd, id webview,
     [w->priv.webview setAutoresizesSubviews:YES];
     [w->priv.webview
         setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-    w->priv.webview.frameLoadDelegate = w->priv.delegate;
-    w->priv.webview.UIDelegate = w->priv.delegate;
+    w->priv.webview.frameLoadDelegate = w->priv.windowDelegate;
     [[w->priv.window contentView] addSubview:w->priv.webview];
     [w->priv.window orderFrontRegardless];
 

runtime/assets/bridge.js

@@ -95,6 +95,13 @@ function startBridge() {
 		window.wailsbridge.reconnectOverlay.style.display = 'none';
 	}
 
+	// Bridge external.invoke
+	window.external = {
+		invoke: function (msg) {
+			window.wailsbridge.websocket.send(msg);
+		}
+	};
+
 	// Adds a script to the Dom.
 	// Removes it if second parameter is true.
 	function addScript(script, remove) {
@@ -204,12 +211,7 @@ function start(callback) {
 }
 
 function Init(callback) {
-	// Bridge window.invoke
-	window.invoke = function (message) {
-		window.wailsbridge.websocket.send(message);
-	}
-	
 	start(callback);
 }
 
-module.exports = Init;
+module.exports = { Init };

runtime/assets/default.html

@@ -1 +1,18 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><script src="https://raw.githubusercontent.com/firebug/firebug-lite/master/build/firebug-lite-debug.js#startOpened=true"></script></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>
+<!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>

runtime/assets/injectFirebug.js

@@ -1 +0,0 @@
-(function(){console.log=function(message){document.body.innerHTML=document.body.innerHTML+'<p>'+message+'</p>';};var script=document.createElement('script');script.src="https://raw.githubusercontent.com/firebug/firebug-lite/master/build/firebug-lite-debug.js#startOpened=true";document.body.appendChild(script);})();

runtime/js/.eslintrc

@@ -15,7 +15,10 @@
             "error",
             "tab"
         ],
-        "linebreak-style": 0,
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
         "quotes": [
             "error",
             "single"

runtime/js/babel.config.js

@@ -7,7 +7,7 @@ module.exports = function (api) {
     [
       "@babel/preset-env",
       {
-        "useBuiltIns": "usage",
+        "useBuiltIns": "entry",
         "corejs": {
           "version": 3,
           "proposals": true
@@ -16,10 +16,7 @@ module.exports = function (api) {
     ]
   ];
 
-  const plugins = ["@babel/plugin-transform-object-assign", "transform-es2015-shorthand-properties"]
-
   return {
     presets,
-    plugins
   };
 }

runtime/js/bridge/webpack.config.js

@@ -1,37 +0,0 @@
-/* eslint-disable */
-
-const path = require('path');
-
-module.exports = {
-  entry: './bridge.js',
-  mode: 'production',
-  output: {
-    path: path.resolve(__dirname, '..', 'assets'),
-    filename: 'bridge.js',
-    libraryTarget: 'this'
-  },
-  module: {
-    rules: [
-      {
-        test: /\.m?js$/,
-        exclude: /(node_modules|bower_components)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            plugins: [],
-            presets: [
-              [
-                '@babel/preset-env',
-                {
-                  'useBuiltIns': 'usage',
-                  'corejs': 3,
-                  'targets': { "browsers": ["last 2 versions", "ie >= 9"] }
-                }
-              ]
-            ]
-          }
-        }
-      }
-    ]
-  }
-};

runtime/js/core/ipc.js

@@ -15,11 +15,7 @@ The lightweight framework for web-like apps
  * @param {string} message
  */
 function Invoke(message) {
-	if ( window.wailsbridge ) {
-		window.wailsbridge.websocket.send(message);
-	} else {
-		window.external.invoke(message);
-	}
+	window.external.invoke(message);
 }
 
 /**

runtime/js/core/main.js

@@ -10,7 +10,7 @@ The lightweight framework for web-like apps
 /* jshint esversion: 6 */
 import * as Log from './log';
 import * as Browser from './browser';
-import { On, OnMultiple, Emit, Notify, Heartbeat, Acknowledge } from './events';
+import { On, Emit, Notify, Heartbeat, Acknowledge } from './events';
 import { NewBinding } from './bindings';
 import { Callback } from './calls';
 import { AddScript, InjectCSS } from './utils';
@@ -35,7 +35,6 @@ var runtime = {
 	Browser,
 	Events: {
 		On,
-		OnMultiple,
 		Emit,
 		Heartbeat,
 		Acknowledge,

runtime/js/package.json

@@ -4,8 +4,8 @@
   "description": "The Javascript Wails Runtime",
   "main": "index.js",
   "scripts": {
-    "build": "./node_modules/.bin/eslint core/ && npm run build:prod",
-    "build:prod": "./node_modules/.bin/webpack --env prod --colors",
+    "build": "eslint core/ && npm run build:prod",
+    "build:prod": "webpack --env prod --colors",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -33,15 +33,11 @@
     "@babel/core": "^7.5.4",
     "@babel/plugin-transform-object-assign": "^7.2.0",
     "@babel/preset-env": "^7.5.4",
-    "babel-core": "^6.26.3",
     "babel-loader": "^8.0.6",
-    "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-    "babel-preset-es2015": "^6.24.1",
     "babel-preset-minify": "^0.5.0",
     "core-js": "^3.1.4",
-    "eslint": "^6.5.1",
-    "webpack": "^4.41.2",
+    "eslint": "^6.2.2",
+    "webpack": "^4.35.3",
     "webpack-cli": "^3.3.5"
-  },
-  "dependencies": {}
+  }
 }

runtime/js/runtime/browser.js

@@ -32,6 +32,6 @@ function OpenFile(filename) {
 }
 
 module.exports = {
-	OpenURL: OpenURL,
-	OpenFile: OpenFile
+	OpenURL,
+	OpenFile
 };

runtime/js/runtime/events.js

@@ -61,9 +61,9 @@ function Emit(eventName) {
  * the event is acknowledged via `Event.Acknowledge`. Once this happens, `callback` is invoked ONCE
  *
  * @export
- * @param {string} eventName
- * @param {number} timeInMilliseconds
- * @param {function} callback
+ * @param {*} eventName
+ * @param {*} timeInMilliseconds
+ * @param {*} callback
  */
 function Heartbeat(eventName, timeInMilliseconds, callback) {
 	window.wails.Events.Heartbeat(eventName, timeInMilliseconds, callback);
@@ -80,10 +80,10 @@ function Acknowledge(eventName) {
 }
 
 module.exports = {
-	OnMultiple: OnMultiple,
-	On: On,
-	Once: Once,
-	Emit: Emit,
-	Heartbeat: Heartbeat,
-	Acknowledge: Acknowledge
+	OnMultiple,
+	On,
+	Once,
+	Emit,
+	Heartbeat,
+	Acknowledge
 };

runtime/js/runtime/init.js

@@ -18,4 +18,6 @@ function Init(callback) {
 	window.wails._.Init(callback);
 }
 
-module.exports = Init;
+module.exports = {
+	Init
+};

runtime/js/runtime/log.js

@@ -62,9 +62,9 @@ function Fatal(message) {
 }
 
 module.exports = {
-	Debug: Debug,
-	Info: Info,
-	Warning: Warning,
-	Error: Error,
-	Fatal: Fatal
+	Debug,
+	Info,
+	Warning,
+	Error,
+	Fatal
 };

runtime/js/runtime/main.js

@@ -15,8 +15,8 @@ const Events = require('./events');
 const Init = require('./init');
 
 module.exports = {
-	Log: Log,
-	Browser: Browser,
-	Events: Events,
-	Init: Init
+	Log,
+	Browser,
+	Events,
+	Init
 };

runtime/js/runtime/package.json

@@ -1,12 +1,10 @@
 {
   "name": "@wailsapp/runtime",
-  "version": "1.0.8",
+  "version": "1.0.2",
   "description": "Wails Javascript runtime library",
   "main": "main.js",
-  "types": "runtime.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
@@ -22,18 +20,5 @@
   "bugs": {
     "url": "https://github.com/wailsapp/wails/issues"
   },
-  "files": [
-    "*.js",
-    "!webpack.config.js",
-    "runtime.d.ts",
-    "README.md"
-  ],
-  "homepage": "https://github.com/wailsapp/wails#readme",
-  "devDependencies": {
-    "babel-core": "^6.26.3",
-    "babel-loader": "^8.0.6",
-    "babel-preset-es2015": "^6.24.1",
-    "dts-gen": "^0.5.8",
-    "webpack": "^4.41.2"
-  }
-}
+  "homepage": "https://github.com/wailsapp/wails#readme"
+}

runtime/js/runtime/runtime.d.ts

@@ -1,26 +0,0 @@
-export = wailsapp__runtime;
-
-declare const wailsapp__runtime: {
-    Browser: {
-        OpenFile(filename: string): Promise<any>;
-        OpenURL(url: string): Promise<any>;
-    };
-    Events: {
-        Acknowledge(eventName: string): void; 
-        Emit(eventName: string): void;
-        Heartbeat(eventName: string, timeInMilliseconds: number, callback: () => void): void;
-        On(eventName: string, callback: () => void): void;
-        OnMultiple(eventName: string, callback: () => void, maxCallbacks: number): void;
-        Once(eventName: string, callback: () => void): void;
-    };
-    Init(callback: () => void): void;
-    Log: {
-        Debug(message: string): void;
-        Error(message: string): void;
-        Fatal(message: string): void;
-        Info(message: string): void;
-        Warning(message: string): void;
-    };
-};
-
-

runtime/js/runtime/webpack.config.js

@@ -1,37 +0,0 @@
-/* eslint-disable */
-
-const path = require('path');
-
-module.exports = {
-  entry: './main.js',
-  mode: 'production',
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'main.js',
-    libraryTarget: 'this'
-  },
-  module: {
-    rules: [
-      {
-        test: /\.m?js$/,
-        exclude: /(node_modules|bower_components)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            plugins: [],
-            presets: [
-              [
-                '@babel/preset-env',
-                {
-                  'useBuiltIns': 'usage',
-                  'corejs': 3,
-                  'targets': { "browsers": ["last 2 versions", "ie >= 9"] }
-                }
-              ]
-            ]
-          }
-        }
-      }
-    ]
-  }
-};

runtime/js/webpack.prod.js

@@ -17,14 +17,16 @@ module.exports = {
         use: {
           loader: 'babel-loader',
           options: {
-            plugins: [],
+            plugins: ['@babel/plugin-transform-object-assign'],
             presets: [
               [
                 '@babel/preset-env',
                 {
-                  'useBuiltIns': 'usage',
-                  'corejs': 3,
-                  'targets': { "browsers": ["last 2 versions", "ie >= 9"] }
+                  'useBuiltIns': 'entry',
+                  'corejs': {
+                    'version': 3,
+                    'proposals': true
+                  }
                 }
               ]
             ]

runtime/window.go

@@ -1,54 +1,6 @@
 package runtime
 
-import (
-	"bytes"
-	"runtime"
-
-	"github.com/abadojack/whatlanggo"
-	"github.com/wailsapp/wails/lib/interfaces"
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/japanese"
-	"golang.org/x/text/encoding/korean"
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/transform"
-)
-
-func detectEncoding(text string) (encoding.Encoding, string) {
-	// korean
-	var enc encoding.Encoding
-	info := whatlanggo.Detect(text)
-	//fmt.Println("Language:", info.Lang.String(), " Script:", whatlanggo.Scripts[info.Script], " Confidence: ", info.Confidence)
-	switch info.Lang.String() {
-	case "Korean":
-		enc = korean.EUCKR
-	case "Mandarin":
-		enc = simplifiedchinese.GBK
-	case "Japanese":
-		enc = japanese.EUCJP
-	}
-	return enc, info.Lang.String()
-}
-
-// ProcessEncoding attempts to convert CKJ strings to UTF-8
-func ProcessEncoding(text string) string {
-	if runtime.GOOS != "windows" {
-		return text
-	}
-
-	encoding, _ := detectEncoding(text)
-	if encoding != nil {
-		var bufs bytes.Buffer
-		wr := transform.NewWriter(&bufs, encoding.NewEncoder())
-		_, err := wr.Write([]byte(text))
-		defer wr.Close()
-		if err != nil {
-			return ""
-		}
-
-		return bufs.String()
-	}
-	return text
-}
+import "github.com/wailsapp/wails/lib/interfaces"
 
 // Window exposes an interface for manipulating the window
 type Window struct {
@@ -79,7 +31,6 @@ func (r *Window) UnFullscreen() {
 
 // SetTitle sets the the window title
 func (r *Window) SetTitle(title string) {
-	title = ProcessEncoding(title)
 	r.renderer.SetTitle(title)
 }
 

scripts/build.go

@@ -1,82 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-// Default target to run when none is specified
-// If not set, running mage will list available targets
-// var Default = Build
-
-/*
-# Build runtime
-echo "**** Building Runtime ****"
-cd runtime/js
-npm install
-npm run build
-cd ../..
-
-echo "**** Packing Assets ****"
-cd cmd
-mewn
-cd ..
-cd lib/renderer
-mewn
-cd ../..
-
-echo "**** Installing Wails locally ****"
-cd cmd/wails
-go install
-cd ../..
-
-echo "**** Tidying the mods! ****"
-go mod tidy
-
-echo "**** WE ARE DONE! ****"
-
-*/
-
-func runCommand(command string, args ...string) {
-	cmd := exec.Command(command, args...)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		log.Fatal(err)
-	}
-	cmd.Run()
-	fmt.Println(string(output))
-}
-
-// A build step that requires additional params, or platform specific steps for example
-func main() {
-
-	dir, _ := os.Getwd()
-
-	// Build Runtime
-	fmt.Println("**** Building Runtime ****")
-	runtimeDir, _ := filepath.Abs(filepath.Join(dir, "..", "runtime", "js"))
-	os.Chdir(runtimeDir)
-	runCommand("npm", "run", "build")
-
-	// Pack assets
-	fmt.Println("**** Packing Assets ****")
-	rendererDir, _ := filepath.Abs(filepath.Join(dir, "..", "lib", "renderer"))
-	os.Chdir(rendererDir)
-	runCommand("mewn")
-	cmdDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd"))
-	os.Chdir(cmdDir)
-	runCommand("mewn")
-
-	// Install Wails
-	fmt.Println("**** Installing Wails locally ****")
-	execDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd", "wails"))
-	os.Chdir(execDir)
-	runCommand("go", "install")
-
-	baseDir, _ := filepath.Abs(filepath.Join(dir, ".."))
-	os.Chdir(baseDir)
-	runCommand("go", "mod", "tidy")
-}

scripts/build.sh

@@ -3,17 +3,11 @@
 # Build runtime
 echo "**** Building Runtime ****"
 cd runtime/js
-npm install
 npm run build
 cd ../..
 
 echo "**** Packing Assets ****"
-cd cmd
 mewn
-cd ..
-cd lib/renderer
-mewn
-cd ../..
 
 echo "**** Installing Wails locally ****"
 cd cmd/wails