bump version

* Implement verbose output
Works for build and serve

* Tidy go modules

.github/workflows/latest-pre.yml

@@ -0,0 +1,32 @@
+name: latest pre-release
+on:
+  push:
+    tags:
+    - '**-pre**'
+jobs:
+
+  build:
+    name: Test Build Latest Pre-Release
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+    steps:
+
+    - name: Set up Go 1.12
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.12
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v1
+
+    - name: Get dependencies
+      run: |
+        go get -v -d ./...
+    - name: Build
+      run: go build -v ./cmd/wails
+    
+    - name: Test
+      run: ./wails version

.github/workflows/pr.yml

@@ -0,0 +1,32 @@
+name: pr
+on:
+  pull_request:
+    branches:
+    - develop
+jobs:
+
+  build:
+    name: Test Build PR
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+    steps:
+
+    - name: Set up Go 1.12
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.12
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v1
+
+    - name: Get dependencies
+      run: |
+        go get -v -d ./...
+    - name: Build
+      run: go build -v ./cmd/wails
+    
+    - name: Test
+      run: ./wails version

.github/workflows/release.yml

@@ -0,0 +1,34 @@
+name: release
+on:
+  push:
+    branches:
+    - master
+    tags:
+    - '!**pre**' 
+jobs:
+
+  build:
+    name: Test Build Latest Release
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+    steps:
+
+    - name: Set up Go 1.12
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.12
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v1
+
+    - name: Get dependencies
+      run: |
+        go get -v -d ./...
+    - name: Build
+      run: go build -v ./cmd/wails
+    
+    - name: Test
+      run: ./wails version

README.md

@@ -11,7 +11,8 @@
    <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://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" rel="nofollow"><img src="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" alt="Release Pipelines"></a>
+   <a href="https://github.com/wailsapp/wails/workflows/latest-pre/badge.svg?branch=masterr" rel="nofollow"><img src="https://github.com/wailsapp/wails/workflows/latest-pre/badge.svg?branch=master" alt="Pre-Release Pipelines"></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!
@@ -146,3 +147,11 @@ This project was mainly coded to the following albums:
 ## 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)
+
+## Special Thank You
+
+<p align="center" style="text-align: center">
+   A special thank you to JetBrains for donating licenses to us!<br/><br/>
+   Please click the logo to let them know your appreciation!<br/><br/>
+   <a href="https://www.jetbrains.com?from=Wails"><img src="jetbrains-grayscale.png" width="30%"></a>
+</p>

app.go

@@ -97,7 +97,7 @@ func (a *App) start() error {
 
 	// Check if we are to run in bridge mode
 	if BuildMode == cmd.BuildModeBridge {
-		a.renderer = &renderer.Bridge{}
+		a.renderer = renderer.NewBridge()
 	}
 
 	// Initialise the renderer

azure-pipelines.yaml

@@ -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'

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/gomod.go

@@ -0,0 +1,78 @@
+package cmd
+
+import (
+	"fmt"
+	"path/filepath"
+	"regexp"
+
+	"github.com/Masterminds/semver"
+)
+
+func GetWailsVersion() (*semver.Version, error) {
+	var FS = NewFSHelper()
+	var result *semver.Version
+
+	// Load file
+	var err error
+	goModFile, err := filepath.Abs(filepath.Join(".", "go.mod"))
+	if err != nil {
+		return nil, fmt.Errorf("Unable to load go.mod at %s", goModFile)
+	}
+	goMod, err := FS.LoadAsString(goModFile)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to load go.mod")
+	}
+
+	// Find wails version
+	versionRegexp := regexp.MustCompile(`.*github.com/wailsapp/wails.*(v\d+.\d+.\d+(?:-pre\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)
+	}
+	return result, nil
+
+}
+
+func GetCurrentVersion() (*semver.Version, error) {
+	result, err := semver.NewVersion(Version)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to parse Wails version: %s", Version)
+	}
+	return result, nil
+}
+
+func GoModOutOfSync() (bool, error) {
+	gomodversion, err := GetWailsVersion()
+	if err != nil {
+		return true, err
+	}
+	currentVersion, err := GetCurrentVersion()
+	if err != nil {
+		return true, err
+	}
+	result := !currentVersion.Equal(gomodversion)
+	return result, nil
+}
+
+func UpdateGoModVersion() error {
+	currentVersion, err := GetCurrentVersion()
+	if err != nil {
+		return err
+	}
+	currentVersionString := currentVersion.String()
+
+	requireLine := "-require=github.com/wailsapp/wails@v" + currentVersionString
+
+	// Issue: go mod edit -require=github.com/wailsapp/wails@1.0.2-pre5
+	helper := NewProgramHelper()
+	command := []string{"go", "mod", "edit", requireLine}
+	return helper.RunCommandArray(command)
+
+}

cmd/helpers.go

@@ -36,16 +36,23 @@ func ValidateFrontendConfig(projectOptions *ProjectOptions) error {
 }
 
 // InstallGoDependencies will run go get in the current directory
-func InstallGoDependencies() error {
+func InstallGoDependencies(verbose bool) error {
-	depSpinner := spinner.New("Ensuring Dependencies are up to date...")
+	var depSpinner *spinner.Spinner
-	depSpinner.SetSpinSpeed(50)
+	if !verbose {
-	depSpinner.Start()
+		depSpinner = spinner.New("Ensuring Dependencies are up to date...")
-	err := NewProgramHelper().RunCommand("go get")
+		depSpinner.SetSpinSpeed(50)
+		depSpinner.Start()
+	}
+	err := NewProgramHelper(verbose).RunCommand("go get")
 	if err != nil {
-		depSpinner.Error()
+		if !verbose {
+			depSpinner.Error()
+		}
 		return err
 	}
-	depSpinner.Success()
+	if !verbose {
+		depSpinner.Success()
+	}
 	return nil
 }
 
@@ -62,7 +69,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	}
 
 	// Check Mewn is installed
-	err := CheckMewn()
+	err := CheckMewn(projectOptions.Verbose)
 	if err != nil {
 		return err
 	}
@@ -73,9 +80,14 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 		compileMessage += " (Debug Mode)"
 	}
 
-	packSpinner := spinner.New(compileMessage + "...")
+	var packSpinner *spinner.Spinner
-	packSpinner.SetSpinSpeed(50)
+	if !projectOptions.Verbose {
-	packSpinner.Start()
+		packSpinner = spinner.New(compileMessage + "...")
+		packSpinner.SetSpinSpeed(50)
+		packSpinner.Start()
+	} else {
+		println(compileMessage)
+	}
 
 	buildCommand := slicer.String()
 	buildCommand.Add("mewn")
@@ -131,12 +143,16 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	}
 
 	buildCommand.AddSlice([]string{"-ldflags", ldflags})
-	err = NewProgramHelper().RunCommandArray(buildCommand.AsSlice())
+	err = NewProgramHelper(projectOptions.Verbose).RunCommandArray(buildCommand.AsSlice())
 	if err != nil {
-		packSpinner.Error()
+		if packSpinner != nil {
+			packSpinner.Error()
+		}
 		return err
 	}
-	packSpinner.Success()
+	if packSpinner != nil {
+		packSpinner.Success()
+	}
 
 	// packageApp
 	if packageApp {
@@ -160,45 +176,68 @@ func PackageApplication(projectOptions *ProjectOptions) error {
 		}
 		message = "Generating resource bundle"
 	}
-	packageSpinner := spinner.New(message)
+	var packageSpinner *spinner.Spinner
-	packageSpinner.SetSpinSpeed(50)
+	if projectOptions.Verbose {
-	packageSpinner.Start()
+		packageSpinner = spinner.New(message)
+		packageSpinner.SetSpinSpeed(50)
+		packageSpinner.Start()
+	}
 	err := NewPackageHelper().Package(projectOptions)
 	if err != nil {
-		packageSpinner.Error()
+		if packageSpinner != nil {
+			packageSpinner.Error()
+		}
 		return err
 	}
-	packageSpinner.Success()
+	if packageSpinner != nil {
+		packageSpinner.Success()
+	}
 	return nil
 }
 
 // BuildFrontend runs the given build command
-func BuildFrontend(buildCommand string) error {
+func BuildFrontend(projectOptions *ProjectOptions) error {
-	buildFESpinner := spinner.New("Building frontend...")
+	var buildFESpinner *spinner.Spinner
-	buildFESpinner.SetSpinSpeed(50)
+	if !projectOptions.Verbose {
-	buildFESpinner.Start()
+		buildFESpinner = spinner.New("Building frontend...")
-	err := NewProgramHelper().RunCommand(buildCommand)
+		buildFESpinner.SetSpinSpeed(50)
+		buildFESpinner.Start()
+	} else {
+		println("Building frontend...")
+	}
+	err := NewProgramHelper(projectOptions.Verbose).RunCommand(projectOptions.FrontEnd.Build)
 	if err != nil {
-		buildFESpinner.Error()
+		if buildFESpinner != nil {
+			buildFESpinner.Error()
+		}
 		return err
 	}
-	buildFESpinner.Success()
+	if buildFESpinner != nil {
+		buildFESpinner.Success()
+	}
 	return nil
 }
 
 // CheckMewn checks if mewn is installed and if not, attempts to fetch it
-func CheckMewn() (err error) {
+func CheckMewn(verbose bool) (err error) {
-	programHelper := NewProgramHelper()
+	programHelper := NewProgramHelper(verbose)
 	if !programHelper.IsInstalled("mewn") {
-		buildSpinner := spinner.New()
+		var buildSpinner *spinner.Spinner
-		buildSpinner.SetSpinSpeed(50)
+		if !verbose {
-		buildSpinner.Start("Installing Mewn asset packer...")
+			buildSpinner = spinner.New()
+			buildSpinner.SetSpinSpeed(50)
+			buildSpinner.Start("Installing Mewn asset packer...")
+		}
 		err := programHelper.InstallGoPackage("github.com/leaanthony/mewn/cmd/mewn")
 		if err != nil {
-			buildSpinner.Error()
+			if buildSpinner != nil {
+				buildSpinner.Error()
+			}
 			return err
 		}
-		buildSpinner.Success()
+		if buildSpinner != nil {
+			buildSpinner.Success()
+		}
 	}
 	return nil
 }
@@ -225,9 +264,14 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	}
 
 	// Check if frontend deps have been updated
-	feSpinner := spinner.New("Ensuring frontend dependencies are up to date (This may take a while)")
+	var feSpinner *spinner.Spinner
-	feSpinner.SetSpinSpeed(50)
+	if !projectOptions.Verbose {
-	feSpinner.Start()
+		feSpinner = spinner.New("Ensuring frontend dependencies are up to date (This may take a while)")
+		feSpinner.SetSpinSpeed(50)
+		feSpinner.Start()
+	} else {
+		println("Ensuring frontend dependencies are up to date (This may take a while)")
+	}
 
 	requiresNPMInstall := true
 
@@ -259,7 +303,11 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 			if savedMD5sum == packageJSONMD5 {
 				// Same - no need for reinstall
 				requiresNPMInstall = false
-				feSpinner.Success("Skipped frontend dependencies (-f to force rebuild)")
+				if feSpinner != nil {
+					feSpinner.Success("Skipped frontend dependencies (-f to force rebuild)")
+				} else {
+					println("Skipped frontend dependencies (-f to force rebuild)")
+				}
 			}
 		}
 	}
@@ -268,12 +316,16 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	// Different? Build
 	if requiresNPMInstall || forceRebuild {
 		// Install dependencies
-		err = NewProgramHelper().RunCommand(projectOptions.FrontEnd.Install)
+		err = NewProgramHelper(projectOptions.Verbose).RunCommand(projectOptions.FrontEnd.Install)
 		if err != nil {
-			feSpinner.Error()
+			if feSpinner != nil {
+				feSpinner.Error()
+			}
 			return err
 		}
-		feSpinner.Success()
+		if feSpinner != nil {
+			feSpinner.Success()
+		}
 
 		// Update md5sum file
 		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
@@ -286,7 +338,7 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	}
 
 	// Build frontend
-	err = BuildFrontend(projectOptions.FrontEnd.Build)
+	err = BuildFrontend(projectOptions)
 	if err != nil {
 		return err
 	}

cmd/program.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"bytes"
 	"fmt"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
@@ -11,14 +12,22 @@ import (
 
 // ProgramHelper - Utility functions around installed applications
 type ProgramHelper struct {
-	shell *ShellHelper
+	shell   *ShellHelper
+	verbose bool
 }
 
 // NewProgramHelper - Creates a new ProgramHelper
-func NewProgramHelper() *ProgramHelper {
+func NewProgramHelper(verbose ...bool) *ProgramHelper {
-	return &ProgramHelper{
+	result := &ProgramHelper{
 		shell: NewShellHelper(),
 	}
+	if len(verbose) > 0 {
+		result.verbose = verbose[0]
+		if result.verbose {
+			result.shell.SetVerbose()
+		}
+	}
+	return result
 }
 
 // IsInstalled tries to determine if the given binary name is installed
@@ -29,8 +38,9 @@ func (p *ProgramHelper) IsInstalled(programName string) bool {
 
 // Program - A struct to define an installed application/binary
 type Program struct {
-	Name string `json:"name"`
+	Name    string `json:"name"`
-	Path string `json:"path"`
+	Path    string `json:"path"`
+	verbose bool
 }
 
 // FindProgram attempts to find the given program on the system.FindProgram
@@ -45,8 +55,9 @@ func (p *ProgramHelper) FindProgram(programName string) *Program {
 		return nil
 	}
 	return &Program{
-		Name: programName,
+		Name:    programName,
-		Path: path,
+		Path:    path,
+		verbose: p.verbose,
 	}
 }
 
@@ -63,12 +74,18 @@ func (p *Program) Run(vars ...string) (stdout, stderr string, exitCode int, err
 		return "", "", 1, err
 	}
 	cmd := exec.Command(command, vars...)
-	var stdo, stde bytes.Buffer
+	if !p.verbose {
-	cmd.Stdout = &stdo
+		var stdo, stde bytes.Buffer
-	cmd.Stderr = &stde
+		cmd.Stdout = &stdo
-	err = cmd.Run()
+		cmd.Stderr = &stde
-	stdout = string(stdo.Bytes())
+		err = cmd.Run()
-	stderr = string(stde.Bytes())
+		stdout = string(stdo.Bytes())
+		stderr = string(stde.Bytes())
+	} else {
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		err = cmd.Run()
+	}
 
 	// https://stackoverflow.com/questions/10385551/get-exit-code-go
 	if err != nil {

cmd/project.go

@@ -158,6 +158,7 @@ type ProjectOptions struct {
 	selectedTemplate       *TemplateDetails
 	WailsVersion           string
 	typescriptDefsFilename string
+	Verbose                bool `json:"-"`
 }
 
 // Defaults sets the default project template

cmd/shell.go

@@ -8,6 +8,7 @@ import (
 
 // ShellHelper helps with Shell commands
 type ShellHelper struct {
+	verbose bool
 }
 
 // NewShellHelper creates a new ShellHelper!
@@ -15,16 +16,27 @@ func NewShellHelper() *ShellHelper {
 	return &ShellHelper{}
 }
 
+// SetVerbose sets the verbose flag
+func (sh *ShellHelper) SetVerbose() {
+	sh.verbose = true
+}
+
 // Run the given command
 func (sh *ShellHelper) Run(command string, vars ...string) (stdout, stderr string, err error) {
 	cmd := exec.Command(command, vars...)
 	cmd.Env = append(os.Environ(), "GO111MODULE=on")
-	var stdo, stde bytes.Buffer
+	if !sh.verbose {
-	cmd.Stdout = &stdo
+		var stdo, stde bytes.Buffer
-	cmd.Stderr = &stde
+		cmd.Stdout = &stdo
-	err = cmd.Run()
+		cmd.Stderr = &stde
-	stdout = string(stdo.Bytes())
+		err = cmd.Run()
-	stderr = string(stde.Bytes())
+		stdout = string(stdo.Bytes())
+		stderr = string(stde.Bytes())
+	} else {
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		err = cmd.Run()
+	}
 	return
 }
 
@@ -33,11 +45,17 @@ func (sh *ShellHelper) RunInDirectory(dir string, command string, vars ...string
 	cmd := exec.Command(command, vars...)
 	cmd.Dir = dir
 	cmd.Env = append(os.Environ(), "GO111MODULE=on")
-	var stdo, stde bytes.Buffer
+	if !sh.verbose {
-	cmd.Stdout = &stdo
+		var stdo, stde bytes.Buffer
-	cmd.Stderr = &stde
+		cmd.Stdout = &stdo
-	err = cmd.Run()
+		cmd.Stderr = &stde
-	stdout = string(stdo.Bytes())
+		err = cmd.Run()
-	stderr = string(stde.Bytes())
+		stdout = string(stdo.Bytes())
+		stderr = string(stde.Bytes())
+	} else {
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		err = cmd.Run()
+	}
 	return
 }

cmd/templates/create-react-app/frontend/package.json.template

@@ -4,12 +4,12 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "core-js": "^3.1.4",
+    "core-js": "^3.6.4",
-    "react": "^16.8.6",
+    "react": "^16.13.0",
-    "react-dom": "^16.8.6",
+    "react-dom": "^16.13.0",
     "wails-react-scripts": "3.0.1-2",
-    "react-modal": "3.8.1",
+    "react-modal": "3.11.2",
-    "@wailsapp/runtime": "^1.0.0"
+    "@wailsapp/runtime": "^1.0.10"
   },
   "scripts": {
     "start": "react-scripts start",

cmd/templates/vuebasic/frontend/package.json.template

@@ -8,21 +8,21 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "core-js": "^3.6.1",
+    "core-js": "^3.6.4",
     "regenerator-runtime": "^0.13.3",
-    "vue": "^2.5.22",
+    "vue": "^2.6.11",
-    "@wailsapp/runtime": "^1.0.0"
+    "@wailsapp/runtime": "^1.0.10"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.4.0",
+    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-eslint": "^3.4.0",
+    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-service": "^3.4.0",
+    "@vue/cli-service": "^4.2.3",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.1.0",
-    "eslint": "^5.8.0",
+    "eslint": "^6.8.0",
-    "eslint-plugin-vue": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.1",
     "eventsource-polyfill": "^0.9.6",
-    "vue-template-compiler": "^2.5.21",
+    "vue-template-compiler": "^2.6.11",
-    "webpack-hot-middleware": "^2.24.3"
+    "webpack-hot-middleware": "^2.25.0"
   },
   "eslintConfig": {
     "root": true,

cmd/templates/vuetify-basic/frontend/package.json.template

@@ -7,24 +7,24 @@
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
-  "dependencies": {
+"dependencies": {
-    "core-js": "^3.6.1",
+    "core-js": "^3.6.4",
     "regenerator-runtime": "^0.13.3",
     "material-design-icons-iconfont": "^5.0.1",
     "vue": "^2.5.22",
     "vuetify": "^1.5.14",
-    "@wailsapp/runtime": "^1.0.0"
+    "@wailsapp/runtime": "^1.0.10"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.4.0",
+    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-eslint": "^3.4.0",
+    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-service": "^3.4.0",
+    "@vue/cli-service": "^4.2.3",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.1.0",
-    "eslint": "^5.8.0",
+    "eslint": "^6.8.0",
-    "eslint-plugin-vue": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.1",
     "eventsource-polyfill": "^0.9.6",
-    "vue-template-compiler": "^2.5.21",
+    "vue-template-compiler": "^2.6.11",
-    "webpack-hot-middleware": "^2.24.3"
+    "webpack-hot-middleware": "^2.25.0"
   },
   "eslintConfig": {
     "root": true,

cmd/templates/vuetify2-basic/frontend/package.json.template

@@ -8,23 +8,23 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "core-js": "^3.6.1",
+    "core-js": "^3.6.4",
     "regenerator-runtime": "^0.13.3",
-    "vue": "^2.5.22",
+    "vue": "^2.6.11",
-    "vuetify": "^2.0.15",
+    "vuetify": "^2.2.15",
-    "@wailsapp/runtime": "^1.0.0"
+    "@wailsapp/runtime": "^1.0.10"
   },
   "devDependencies": {
-    "@mdi/font": "^4.3.95",
+    "@mdi/font": "^4.9.95",
-    "@vue/cli-plugin-babel": "^3.4.0",
+    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-eslint": "^3.4.0",
+    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-service": "^3.4.0",
+    "@vue/cli-service": "^4.2.3",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.1.0",
-    "eslint": "^5.8.0",
+    "eslint": "^6.8.0",
-    "eslint-plugin-vue": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.1",
     "eventsource-polyfill": "^0.9.6",
-    "vue-template-compiler": "^2.5.21",
+    "vue-template-compiler": "^2.6.11",
-    "webpack-hot-middleware": "^2.24.3"
+    "webpack-hot-middleware": "^2.25.0"
   },
   "eslintConfig": {
     "root": true,

cmd/version.go

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

cmd/wails/0_setup.go

@@ -40,7 +40,7 @@ Create your first project by running 'wails init'.`
 		}
 
 		// Check Mewn
-		err = cmd.CheckMewn()
+		err = cmd.CheckMewn(false)
 		if err != nil {
 			return err
 		}

cmd/wails/15_migrate.go

@@ -7,7 +7,6 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 
 	"github.com/Masterminds/semver"
@@ -183,35 +182,13 @@ func checkProjectDirectory() error {
 
 func getWailsVersion() (*semver.Version, error) {
 	checkSpinner.Start("Get Wails Version")
-	var result *semver.Version
 
-	// Load file
+	result, err := cmd.GetWailsVersion()
-	var err error
+
-	goModFile, err = filepath.Abs(filepath.Join(".", "go.mod"))
 	if err != nil {
-		checkSpinner.Error()
+		checkSpinner.Error(err.Error())
-		return nil, fmt.Errorf("Unable to load go.mod at %s", goModFile)
+		return nil, err
 	}
-	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
 
 }

cmd/wails/4_build.go

@@ -14,6 +14,7 @@ func init() {
 	var forceRebuild = false
 	var debugMode = false
 	var typescriptFilename = ""
+	var verbose = false
 
 	buildSpinner := spinner.NewSpinner()
 	buildSpinner.SetSpinSpeed(50)
@@ -24,6 +25,7 @@ func init() {
 		BoolFlag("p", "Package application on successful build", &packageApp).
 		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
 		BoolFlag("d", "Build in Debug mode", &debugMode).
+		BoolFlag("verbose", "Verbose output", &verbose).
 		StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename)
 
 	initCmd.Action(func() error {
@@ -40,6 +42,7 @@ func init() {
 
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
+		projectOptions.Verbose = verbose
 
 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -90,7 +93,7 @@ func init() {
 		}
 
 		// Install dependencies
-		err = cmd.InstallGoDependencies()
+		err = cmd.InstallGoDependencies(projectOptions.Verbose)
 		if err != nil {
 			return err
 		}
@@ -106,6 +109,27 @@ func init() {
 			projectOptions.SetTypescriptDefsFilename(typescriptFilename)
 		}
 
+		// Update go.mod if it is out of sync with current version
+		outofsync, err := cmd.GoModOutOfSync()
+		if err != nil {
+			return err
+		}
+		gomodVersion, err := cmd.GetWailsVersion()
+		if err != nil {
+			return err
+		}
+		if outofsync {
+			syncMessage := fmt.Sprintf("Updating go.mod (Wails version %s => %s)", gomodVersion, cmd.Version)
+			buildSpinner := spinner.NewSpinner(syncMessage)
+			buildSpinner.Start()
+			err := cmd.UpdateGoModVersion()
+			if err != nil {
+				buildSpinner.Error(err.Error())
+				return err
+			}
+			buildSpinner.Success()
+		}
+
 		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode, packageApp, projectOptions)
 		if err != nil {
 			return err

cmd/wails/6_serve.go

@@ -10,12 +10,14 @@ import (
 func init() {
 
 	var forceRebuild = false
+	var verbose = false
 	buildSpinner := spinner.NewSpinner()
 	buildSpinner.SetSpinSpeed(50)
 
 	commandDescription := `This command builds then serves your application in bridge mode. Useful for developing your app in a browser.`
 	initCmd := app.Command("serve", "Run your Wails project in bridge mode").
 		LongDescription(commandDescription).
+		BoolFlag("verbose", "Verbose output", &verbose).
 		BoolFlag("f", "Force rebuild of application components", &forceRebuild)
 
 	initCmd.Action(func() error {
@@ -25,13 +27,14 @@ func init() {
 		fmt.Println()
 
 		// Check Mewn is installed
-		err := cmd.CheckMewn()
+		err := cmd.CheckMewn(verbose)
 		if err != nil {
 			return err
 		}
 
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
+		projectOptions.Verbose = verbose
 
 		// Check we are in project directory
 		// Check project.json loads correctly
@@ -51,7 +54,7 @@ func init() {
 		}
 
 		// Install dependencies
-		err = cmd.InstallGoDependencies()
+		err = cmd.InstallGoDependencies(projectOptions.Verbose)
 		if err != nil {
 			return err
 		}

go.mod

@@ -3,9 +3,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
 	github.com/fatih/color v1.7.0
 	github.com/go-playground/colors v1.2.0
 	github.com/gorilla/websocket v1.4.0
@@ -32,4 +29,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )
 
-go 1.13
+go 1.12

go.sum

@@ -7,12 +7,6 @@ github.com/abadojack/whatlanggo v1.0.1/go.mod h1:66WiQbSbJBIlOZMsvbKe5m6pzQovxCH
 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=
-github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc h1:VBS1z48BFEe00G81z8MKOtwX7f/ISkuH38NscT8iVPw=
-github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc/go.mod h1:ABJPuor7YlcsHmvJ1QxX38e2NcufLY3hm0yXv+cy9sI=
-github.com/dchest/htmlmin v0.0.0-20150526090704-e254725e81ac h1:DpMwFluHWoZpV9ex5XjkWO4HyCz5HLVI8XbHw0FhHi4=
-github.com/dchest/htmlmin v0.0.0-20150526090704-e254725e81ac/go.mod h1:XsAE+b4rOZc8gvgsgF+wU75mNBvBcyED1wdd9PBLlJ0=
-github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947 h1:Fm10/KNuoAyBm2P5P5H91Xy21hGcZnBdjR+cMdytv1M=
-github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947/go.mod h1:Dv9D0NUlAsaQcGQZa5kc5mqR9ua72SmA8VXi4cd+cBw=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/go-playground/colors v1.2.0 h1:0EdjTXKrr2g1L/LQTYtIqabeHpZuGZz1U4osS1T8+5M=
@@ -34,8 +28,6 @@ github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/leaanthony/mewn v0.10.7 h1:jCcNJyIUOpwj+I5SuATvCugDjHkoo+j6ubEOxxrxmPA=
 github.com/leaanthony/mewn v0.10.7/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ=
-github.com/leaanthony/slicer v1.3.2 h1:kGWWFoyaY5WzwGrUsHXMmGbssuYthP4qYBNlkNpNAB8=
-github.com/leaanthony/slicer v1.3.2/go.mod h1:VMB/HGvr3uR3MRpFWHWAm0w+DHQLzPHYe2pKfpFlQIQ=
 github.com/leaanthony/slicer v1.4.0 h1:Q9u4w+UBU4WHjXnEDdz+eRLMKF/rnyosRBiqULnc1J8=
 github.com/leaanthony/slicer v1.4.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leaanthony/spinner v0.5.3 h1:IMTvgdQCec5QA4qRy0wil4XsRP+QcG1OwLWVK/LPZ5Y=

lib/binding/manager.go

@@ -114,6 +114,7 @@ func (b *Manager) generateTypescriptDefinitions() error {
 	var output strings.Builder
 
 	for structname, methodList := range b.structList {
+		structname = strings.SplitN(structname, ".", 2)[1]
 		output.WriteString(fmt.Sprintf("Interface %s {\n", structname))
 		for _, method := range methodList {
 			output.WriteString(fmt.Sprintf("\t%s: (...args : any[]) => Promise\n", method))
@@ -125,6 +126,7 @@ func (b *Manager) generateTypescriptDefinitions() error {
 	output.WriteString("Interface Backend {\n")
 
 	for structname := range b.structList {
+		structname = strings.SplitN(structname, ".", 2)[1]
 		output.WriteString(fmt.Sprintf("\t%[1]s: %[1]s\n", structname))
 	}
 	output.WriteString("}\n")

lib/interfaces/ipcmanager.go

@@ -1,9 +1,13 @@
 package interfaces
 
+// CallbackFunc defines the signature of a function required to be provided to the
+// Dispatch function so that the response may be returned
+type CallbackFunc func(string) error
+
 // IPCManager is the event manager interface
 type IPCManager interface {
 	BindRenderer(Renderer)
-	Dispatch(message string)
+	Dispatch(message string, f CallbackFunc)
 	Start(eventManager EventManager, bindingManager BindingManager)
 	Shutdown()
 }

lib/interfaces/renderer.go

@@ -12,7 +12,6 @@ type Renderer interface {
 
 	// Binding
 	NewBinding(bindingName string) error
-	Callback(data string) error
 
 	// Events
 	NotifyEvent(eventData *messages.EventData) error

lib/ipc/manager.go

@@ -135,10 +135,10 @@ func (i *Manager) Start(eventManager interfaces.EventManager, bindingManager int
 // Dispatch receives JSON encoded messages from the renderer.
 // It processes the message to ensure that it is valid and places
 // the processed message on the message queue
-func (i *Manager) Dispatch(message string) {
+func (i *Manager) Dispatch(message string, cb interfaces.CallbackFunc) {
 
 	// Create a new IPC Message
-	incomingMessage, err := newIPCMessage(message, i.SendResponse)
+	incomingMessage, err := newIPCMessage(message, i.SendResponse(cb))
 	if err != nil {
 		i.log.ErrorFields("Could not understand incoming message! ", map[string]interface{}{
 			"message": message,
@@ -158,17 +158,19 @@ func (i *Manager) Dispatch(message string) {
 }
 
 // SendResponse sends the given response back to the frontend
-func (i *Manager) SendResponse(response *ipcResponse) error {
+// It sends the data back to the correct renderer by way of the provided callback function
+func (i *Manager) SendResponse(cb interfaces.CallbackFunc) func(i *ipcResponse) error {
 
-	// Serialise the Message
+	return func(response *ipcResponse) error {
-	data, err := response.Serialise()
+		// Serialise the Message
-	if err != nil {
+		data, err := response.Serialise()
-		fmt.Printf(err.Error())
+		if err != nil {
-		return err
+			fmt.Printf(err.Error())
+			return err
+		}
+		return cb(data)
 	}
 
-	// Call back to the front end
-	return i.renderer.Callback(data)
 }
 
 // Shutdown is called when exiting the Application

lib/renderer/bridge.go

@@ -1,262 +1,10 @@
 package renderer
 
 import (
-	"encoding/json"
+	bridge "github.com/wailsapp/wails/lib/renderer/bridge"
-	"fmt"
-	"net/http"
-	"strings"
-	"sync"
-
-	"github.com/dchest/htmlmin"
-	"github.com/gorilla/websocket"
-	"github.com/leaanthony/mewn"
-	"github.com/wailsapp/wails/lib/interfaces"
-	"github.com/wailsapp/wails/lib/logger"
-	"github.com/wailsapp/wails/lib/messages"
 )
 
-type messageType int
+// NewBridge returns a new Bridge struct
-
+func NewBridge() *bridge.Bridge {
-const (
+	return &bridge.Bridge{}
-	jsMessage messageType = iota
-	cssMessage
-	htmlMessage
-	notifyMessage
-	bindingMessage
-	callbackMessage
-	wailsRuntimeMessage
-)
-
-func (m messageType) toString() string {
-	return [...]string{"j", "s", "h", "n", "b", "c", "w"}[m]
-}
-
-// Bridge is a backend that opens a local web server
-// and renders the files over a websocket
-type Bridge struct {
-	// Common
-	log          *logger.CustomLogger
-	ipcManager   interfaces.IPCManager
-	appConfig    interfaces.AppConfig
-	eventManager interfaces.EventManager
-	bindingCache []string
-
-	// Bridge specific
-	initialisationJS []string
-	server           *http.Server
-	theConnection    *websocket.Conn
-
-	// Mutex for writing to the socket
-	lock sync.Mutex
-}
-
-// Initialise the Bridge Renderer
-func (h *Bridge) Initialise(appConfig interfaces.AppConfig, ipcManager interfaces.IPCManager, eventManager interfaces.EventManager) error {
-	h.ipcManager = ipcManager
-	h.appConfig = appConfig
-	h.eventManager = eventManager
-	ipcManager.BindRenderer(h)
-	h.log = logger.NewCustomLogger("Bridge")
-	return nil
-}
-
-func (h *Bridge) evalJS(js string, mtype messageType) error {
-
-	message := mtype.toString() + js
-
-	if h.theConnection == nil {
-		h.initialisationJS = append(h.initialisationJS, message)
-	} else {
-		// Prepend message type to message
-		h.sendMessage(h.theConnection, message)
-	}
-
-	return nil
-}
-
-// EnableConsole not needed for bridge!
-func (h *Bridge) EnableConsole() {
-}
-
-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{
-		MinifyStyles: true,
-	})
-	if err != nil {
-		h.log.Fatal("Unable to minify CSS: " + css)
-	}
-	minifiedCSS := string(minified)
-	minifiedCSS = strings.Replace(minifiedCSS, "\\", "\\\\", -1)
-	minifiedCSS = strings.Replace(minifiedCSS, "'", "\\'", -1)
-	minifiedCSS = strings.Replace(minifiedCSS, "\n", " ", -1)
-	inject := fmt.Sprintf("wails._.InjectCSS('%s')", minifiedCSS)
-	h.evalJS(inject, cssMessage)
-}
-
-func (h *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
-	conn, err := websocket.Upgrade(w, r, w.Header(), 1024, 1024)
-	if err != nil {
-		http.Error(w, "Could not open websocket connection", http.StatusBadRequest)
-	}
-	h.theConnection = conn
-	h.log.Infof("Connection from frontend accepted [%p].", h.theConnection)
-	conn.SetCloseHandler(func(int, string) error {
-		h.log.Infof("Connection dropped [%p].", h.theConnection)
-		h.theConnection = nil
-		return nil
-	})
-	go h.start(conn)
-}
-
-func (h *Bridge) sendMessage(conn *websocket.Conn, msg string) {
-
-	h.lock.Lock()
-	defer h.lock.Unlock()
-
-	if err := conn.WriteMessage(websocket.TextMessage, []byte(msg)); err != nil {
-		h.log.Error(err.Error())
-	}
-}
-
-func (h *Bridge) start(conn *websocket.Conn) {
-
-	// set external.invoke
-	h.log.Infof("Connected to frontend.")
-
-	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
-	h.evalJS(wailsRuntime, wailsRuntimeMessage)
-
-	// Inject bindings
-	for _, binding := range h.bindingCache {
-		h.evalJS(binding, bindingMessage)
-	}
-
-	// Emit that everything is loaded and ready
-	h.eventManager.Emit("wails:ready")
-
-	for {
-		messageType, buffer, err := conn.ReadMessage()
-		if messageType == -1 {
-			return
-		}
-		if err != nil {
-			h.log.Errorf("Error reading message: ", err)
-			continue
-		}
-
-		h.log.Debugf("Got message: %#v\n", string(buffer))
-
-		h.ipcManager.Dispatch(string(buffer))
-	}
-}
-
-// Run the app in Bridge mode!
-func (h *Bridge) Run() error {
-	h.server = &http.Server{Addr: ":34115"}
-	http.HandleFunc("/bridge", h.wsBridgeHandler)
-
-	h.log.Info("Bridge mode started.")
-	h.log.Info("The frontend will connect automatically.")
-
-	err := h.server.ListenAndServe()
-	if err != nil && err != http.ErrServerClosed {
-		h.log.Fatal(err.Error())
-	}
-	return err
-}
-
-// NewBinding creates a new binding with the frontend
-func (h *Bridge) NewBinding(methodName string) error {
-	h.bindingCache = append(h.bindingCache, methodName)
-	return nil
-}
-
-// SelectFile is unsupported for Bridge but required
-// for the Renderer interface
-func (h *Bridge) SelectFile() string {
-	h.log.Warn("SelectFile() unsupported in bridge mode")
-	return ""
-}
-
-// SelectDirectory is unsupported for Bridge but required
-// for the Renderer interface
-func (h *Bridge) SelectDirectory() string {
-	h.log.Warn("SelectDirectory() unsupported in bridge mode")
-	return ""
-}
-
-// SelectSaveFile is unsupported for Bridge but required
-// for the Renderer interface
-func (h *Bridge) SelectSaveFile() string {
-	h.log.Warn("SelectSaveFile() unsupported in bridge mode")
-	return ""
-}
-
-// Callback sends a callback to the frontend
-func (h *Bridge) Callback(data string) error {
-	return h.evalJS(data, callbackMessage)
-}
-
-// NotifyEvent notifies the frontend of an event
-func (h *Bridge) NotifyEvent(event *messages.EventData) error {
-
-	// Look out! Nils about!
-	var err error
-	if event == nil {
-		err = fmt.Errorf("Sent nil event to renderer.webViewRenderer")
-		h.log.Error(err.Error())
-		return err
-	}
-
-	// Default data is a blank array
-	data := []byte("[]")
-
-	// Process event data
-	if event.Data != nil {
-		// Marshall the data
-		data, err = json.Marshal(event.Data)
-		if err != nil {
-			h.log.Errorf("Cannot unmarshall JSON data in event: %s ", err.Error())
-			return err
-		}
-	}
-
-	message := fmt.Sprintf("window.wails._.Notify('%s','%s')", event.Name, data)
-	return h.evalJS(message, notifyMessage)
-}
-
-// SetColour is unsupported for Bridge but required
-// for the Renderer interface
-func (h *Bridge) SetColour(colour string) error {
-	h.log.WarnFields("SetColour ignored for Bridge more", logger.Fields{"col": colour})
-	return nil
-}
-
-// Fullscreen is unsupported for Bridge but required
-// for the Renderer interface
-func (h *Bridge) Fullscreen() {
-	h.log.Warn("Fullscreen() unsupported in bridge mode")
-}
-
-// UnFullscreen is unsupported for Bridge but required
-// for the Renderer interface
-func (h *Bridge) UnFullscreen() {
-	h.log.Warn("UnFullscreen() unsupported in bridge mode")
-}
-
-// SetTitle is currently unsupported for Bridge but required
-// for the Renderer interface
-func (h *Bridge) SetTitle(title string) {
-	h.log.WarnFields("SetTitle() unsupported in bridge mode", logger.Fields{"title": title})
-}
-
-// 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())
-	}
 }

lib/renderer/bridge/bridge.go

@@ -0,0 +1,214 @@
+package renderer
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"sync"
+
+	"github.com/gorilla/websocket"
+	"github.com/wailsapp/wails/lib/interfaces"
+	"github.com/wailsapp/wails/lib/logger"
+	"github.com/wailsapp/wails/lib/messages"
+)
+
+type messageType int
+
+const (
+	jsMessage messageType = iota
+	cssMessage
+	htmlMessage
+	notifyMessage
+	bindingMessage
+	callbackMessage
+	wailsRuntimeMessage
+)
+
+func (m messageType) toString() string {
+	return [...]string{"j", "s", "h", "n", "b", "c", "w"}[m]
+}
+
+// Bridge is a backend that opens a local web server
+// and renders the files over a websocket
+type Bridge struct {
+	// Common
+	log          *logger.CustomLogger
+	ipcManager   interfaces.IPCManager
+	appConfig    interfaces.AppConfig
+	eventManager interfaces.EventManager
+	bindingCache []string
+
+	// Bridge specific
+	server *http.Server
+
+	lock     sync.Mutex
+	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.ipcManager = ipcManager
+	h.appConfig = appConfig
+	h.eventManager = eventManager
+	ipcManager.BindRenderer(h)
+	h.log = logger.NewCustomLogger("Bridge")
+	return nil
+}
+
+// EnableConsole not needed for bridge!
+func (h *Bridge) EnableConsole() {
+}
+
+func (h *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
+	conn, err := websocket.Upgrade(w, r, w.Header(), 1024, 1024)
+	if err != nil {
+		http.Error(w, "Could not open websocket connection", http.StatusBadRequest)
+	}
+	h.log.Infof("Connection from frontend accepted [%s].", conn.RemoteAddr().String())
+	h.startSession(conn)
+}
+
+func (h *Bridge) startSession(conn *websocket.Conn) {
+	s := session{
+		conn:         conn,
+		bindingCache: h.bindingCache,
+		ipc:          h.ipcManager,
+		log:          h.log,
+		eventManager: h.eventManager,
+	}
+
+	conn.SetCloseHandler(func(int, string) error {
+		h.log.Infof("Connection dropped [%s].", s.Identifier())
+		h.eventManager.Emit("wails:bridge:session:closed", s.Identifier())
+		h.lock.Lock()
+		defer h.lock.Unlock()
+		delete(h.sessions, s.Identifier())
+		return nil
+	})
+
+	h.lock.Lock()
+	defer h.lock.Unlock()
+	go s.start(len(h.sessions) == 0)
+	h.sessions[s.Identifier()] = s
+}
+
+// Run the app in Bridge mode!
+func (h *Bridge) Run() error {
+	h.server = &http.Server{Addr: ":34115"}
+	http.HandleFunc("/bridge", h.wsBridgeHandler)
+
+	h.log.Info("Bridge mode started.")
+	h.log.Info("The frontend will connect automatically.")
+
+	err := h.server.ListenAndServe()
+	if err != nil && err != http.ErrServerClosed {
+		h.log.Fatal(err.Error())
+	}
+	return err
+}
+
+// NewBinding creates a new binding with the frontend
+func (h *Bridge) NewBinding(methodName string) error {
+	h.bindingCache = append(h.bindingCache, methodName)
+	return nil
+}
+
+// SelectFile is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) SelectFile() string {
+	h.log.Warn("SelectFile() unsupported in bridge mode")
+	return ""
+}
+
+// SelectDirectory is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) SelectDirectory() string {
+	h.log.Warn("SelectDirectory() unsupported in bridge mode")
+	return ""
+}
+
+// SelectSaveFile is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) SelectSaveFile() string {
+	h.log.Warn("SelectSaveFile() unsupported in bridge mode")
+	return ""
+}
+
+// NotifyEvent notifies the frontend of an event
+func (h *Bridge) NotifyEvent(event *messages.EventData) error {
+
+	// Look out! Nils about!
+	var err error
+	if event == nil {
+		err = fmt.Errorf("Sent nil event to renderer.webViewRenderer")
+		h.log.Error(err.Error())
+		return err
+	}
+
+	// Default data is a blank array
+	data := []byte("[]")
+
+	// Process event data
+	if event.Data != nil {
+		// Marshall the data
+		data, err = json.Marshal(event.Data)
+		if err != nil {
+			h.log.Errorf("Cannot unmarshall JSON data in event: %s ", err.Error())
+			return err
+		}
+	}
+
+	message := fmt.Sprintf("window.wails._.Notify('%s','%s')", event.Name, data)
+	dead := []session{}
+	for _, session := range h.sessions {
+		err := session.evalJS(message, notifyMessage)
+		if err != nil {
+			h.log.Debugf("Failed to send message to %s - Removing listener : %v", session.Identifier(), err)
+			h.log.Infof("Connection from [%v] unresponsive - dropping", session.Identifier())
+			dead = append(dead, session)
+		}
+	}
+	h.lock.Lock()
+	defer h.lock.Unlock()
+	for _, session := range dead {
+		delete(h.sessions, session.Identifier())
+	}
+
+	return nil
+}
+
+// SetColour is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) SetColour(colour string) error {
+	h.log.WarnFields("SetColour ignored for Bridge more", logger.Fields{"col": colour})
+	return nil
+}
+
+// Fullscreen is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) Fullscreen() {
+	h.log.Warn("Fullscreen() unsupported in bridge mode")
+}
+
+// UnFullscreen is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) UnFullscreen() {
+	h.log.Warn("UnFullscreen() unsupported in bridge mode")
+}
+
+// SetTitle is currently unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) SetTitle(title string) {
+	h.log.WarnFields("SetTitle() unsupported in bridge mode", logger.Fields{"title": title})
+}
+
+// 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())
+	}
+}

lib/renderer/bridge/session.go

@@ -0,0 +1,90 @@
+package renderer
+
+import (
+	"sync"
+
+	"github.com/gorilla/websocket"
+	"github.com/leaanthony/mewn"
+	"github.com/wailsapp/wails/lib/interfaces"
+	"github.com/wailsapp/wails/lib/logger"
+)
+
+// TODO Move this back into bridge.go
+
+// session represents a single websocket session
+type session struct {
+	bindingCache []string
+	conn         *websocket.Conn
+	eventManager interfaces.EventManager
+	log          *logger.CustomLogger
+	ipc          interfaces.IPCManager
+
+	// Mutex for writing to the socket
+	lock sync.Mutex
+}
+
+// Identifier returns a string identifier for the remote connection.
+// Taking the form of the client's <ip address>:<port>.
+func (s *session) Identifier() string {
+	if s.conn != nil {
+		return s.conn.RemoteAddr().String()
+	}
+	return ""
+}
+
+func (s *session) sendMessage(msg string) error {
+	s.lock.Lock()
+	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.")
+
+	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	s.evalJS(wailsRuntime, wailsRuntimeMessage)
+
+	// Inject bindings
+	for _, binding := range s.bindingCache {
+		s.evalJS(binding, bindingMessage)
+	}
+	s.eventManager.Emit("wails:bridge:session:started", s.Identifier())
+
+	// Emit that everything is loaded and ready
+	if firstSession {
+		s.eventManager.Emit("wails:ready")
+	}
+
+	for {
+		messageType, buffer, err := s.conn.ReadMessage()
+		if messageType == -1 {
+			return
+		}
+		if err != nil {
+			s.log.Errorf("Error reading message: %v", err)
+			continue
+		}
+
+		s.log.Debugf("Got message: %#v\n", string(buffer))
+
+		s.ipc.Dispatch(string(buffer), s.Callback)
+	}
+}
+
+// Callback sends a callback to the frontend
+func (s *session) Callback(data string) error {
+	return s.evalJS(data, callbackMessage)
+}
+
+func (s *session) evalJS(js string, mtype messageType) error {
+
+	// Prepend message type to message
+	return s.sendMessage(mtype.toString() + js)
+
+}

lib/renderer/webview.go

@@ -58,7 +58,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 		URL:       config.GetDefaultHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
-			w.ipc.Dispatch(message)
+			w.ipc.Dispatch(message, w.callback)
 		},
 	})
 
@@ -299,8 +299,8 @@ func (w *WebView) SelectSaveFile() string {
 	return result
 }
 
-// Callback sends a callback to the frontend
+// callback sends a callback to the frontend
-func (w *WebView) Callback(data string) error {
+func (w *WebView) callback(data string) error {
 	callbackCMD := fmt.Sprintf("window.wails._.Callback('%s');", data)
 	return w.evalJS(callbackCMD)
 }