Add ldflags option to build

.github/workflows/latest-pre.yml

@@ -13,10 +13,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.12
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.12
       id: go
 
     - name: Check out code into the Go module directory
@@ -27,6 +27,6 @@ jobs:
         go get -v -d ./...
     - name: Build
       run: go build -v ./cmd/wails
-
+    
     - name: Test
       run: ./wails version

.github/workflows/pr.yml

@@ -13,10 +13,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.12
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.12
       id: go
 
     - name: Check out code into the Go module directory
@@ -27,6 +27,6 @@ jobs:
         go get -v -d ./...
     - name: Build
       run: go build -v ./cmd/wails
-
+    
     - name: Test
       run: ./wails version

.github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
     branches:
     - master
     tags:
-    - '!**pre**'
+    - '!**pre**' 
 jobs:
 
   build:
@@ -15,10 +15,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.12
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.12
       id: go
 
     - name: Check out code into the Go module directory
@@ -29,6 +29,6 @@ jobs:
         go get -v -d ./...
     - name: Build
       run: go build -v ./cmd/wails
-
+    
     - name: Test
       run: ./wails version

CONTRIBUTORS.md

@@ -15,6 +15,7 @@ Wails is what it is because of the time and effort given by these great people.
   * [admin_3.exe](https://github.com/bh90210)
   * [iceleo-com](https://github.com/iceleo-com)
   * [fallendusk](https://github.com/fallendusk)
+  * [Florian Didran](https://github.com/fdidron)
   * [Nikolai Zimmermann](https://github.com/Chronophylos)
   * [Toyam Cox](https://github.com/Vaelatern)
   * [Robin Eklind](https://github.com/mewmew)
@@ -28,7 +29,3 @@ Wails is what it is because of the time and effort given by these great people.
   * [msms](https://github.com/sayuthisobri)
   * [dedo1911](https://github.com/dedo1911)
   * [Florian Didron](https://github.com/fdidron)
-  * [Christopher Murphy](https://github.com/Splode)
-  * [Zámbó, Levente](https://github.com/Lyimmi)
-  * [artem](https://github.com/Unix4ever)
-  * [Tim Kipp](https://github.com/timkippdev)

README.md

@@ -36,7 +36,7 @@ The official docs can be found at [https://wails.app](https://wails.app).
 
 Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as an installation of Go. The basic requirements are:
 
-- Go 1.13
+- Go 1.12
 - npm
 
 ### MacOS

cmd/helpers.go

@@ -293,11 +293,9 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 				fmt.Println(err)
 			}
 		}
-		// Removed by popular demand
+		if projectOptions.Platform == "windows" {
-		// TODO: Potentially add a flag to cleanup
+			helper.CleanWindows(projectOptions)
-		// if projectOptions.Platform == "windows" {
+		}
-		// 	helper.CleanWindows(projectOptions)
-		// }
 	}()
 
 	if projectOptions.CrossCompile {

cmd/package.go

@@ -212,8 +212,6 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	packageID := strings.Join([]string{"wails", name, version}, ".")
 	plistData := newPlistData(name, exe, packageID, version, author)
 	appname := po.Name + ".app"
-	plistFilename := path.Join(build, appname, "Contents", "Info.plist")
-	customPlist := path.Join(b.fs.Cwd(), "info.plist")
 
 	// Check binary exists
 	source := path.Join(build, exe)
@@ -232,48 +230,28 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	// Remove the existing package
 	os.RemoveAll(appname)
 
-	// Create directories
 	exeDir := path.Join(build, appname, "/Contents/MacOS")
 	b.fs.MkDirs(exeDir, 0755)
 	resourceDir := path.Join(build, appname, "/Contents/Resources")
 	b.fs.MkDirs(resourceDir, 0755)
+	tmpl := template.New("infoPlist")
+	plistFile := filepath.Join(b.getPackageFileBaseDir(), "info.plist")
+	infoPlist, err := ioutil.ReadFile(plistFile)
+	if err != nil {
+		return err
+	}
+	tmpl.Parse(string(infoPlist))
 
-	// Do we have a custom plist in the project directory?
+	// Write the template to a buffer
-	if !fs.FileExists(customPlist) {
+	var tpl bytes.Buffer
-
+	err = tmpl.Execute(&tpl, plistData)
-		// No - create a new plist from our defaults
+	if err != nil {
-		tmpl := template.New("infoPlist")
+		return err
-		plistFile := filepath.Join(b.getPackageFileBaseDir(), "info.plist")
+	}
-		infoPlist, err := ioutil.ReadFile(plistFile)
+	filename := path.Join(build, appname, "Contents", "Info.plist")
-		if err != nil {
+	err = ioutil.WriteFile(filename, tpl.Bytes(), 0644)
-			return err
+	if err != nil {
-		}
+		return err
-		tmpl.Parse(string(infoPlist))
-
-		// Write the template to a buffer
-		var tpl bytes.Buffer
-		err = tmpl.Execute(&tpl, plistData)
-		if err != nil {
-			return err
-		}
-
-		// Save to the package
-		err = ioutil.WriteFile(plistFilename, tpl.Bytes(), 0644)
-		if err != nil {
-			return err
-		}
-
-		// Also write to project directory for customisation
-		err = ioutil.WriteFile(customPlist, tpl.Bytes(), 0644)
-		if err != nil {
-			return err
-		}
-	} else {
-		// Yes - we have a plist. Copy it to the package verbatim
-		err = fs.CopyFile(customPlist, plistFilename)
-		if err != nil {
-			return err
-		}
 	}
 
 	// Copy executable
@@ -315,7 +293,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	}
 
 	// Generate icon from PNG
-	err = generateWindowsIcon(icon, basename+".ico")
+	err = generateWindowsIcon(icon, po.BinaryName+".ico")
 	if err != nil {
 		return err
 	}

cmd/system.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"os"
 	"path/filepath"
 	"runtime"
 	"strconv"
 	"time"
+
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 // SystemHelper - Defines everything related to the system
@@ -37,11 +38,10 @@ func NewSystemHelper() *SystemHelper {
 // setSystemDirs calculates the system directories it is interested in
 func (s *SystemHelper) setSystemDirs() {
 	var err error
-	s.homeDir, err = os.UserHomeDir()
+	s.homeDir, err = homedir.Dir()
 	if err != nil {
 		log.Fatal("Cannot find home directory! Please file a bug report!")
 	}
-
 	// TODO: A better config system
 	s.wailsSystemDir = filepath.Join(s.homeDir, ".wails")
 	s.wailsSystemConfig = filepath.Join(s.wailsSystemDir, s.configFilename)
@@ -132,7 +132,7 @@ func (s *SystemHelper) setup() error {
 }
 
 const introText = `
-Wails is a lightweight framework for creating web-like desktop apps in Go.
+Wails is a lightweight framework for creating web-like desktop apps in Go. 
 I'll need to ask you a few questions so I can fill in your project templates and then I will try and see if you have the correct dependencies installed. If you don't have the right tools installed, I'll try and suggest how to install them.
 `
 

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

@@ -5,8 +5,8 @@
   "private": true,
   "dependencies": {
     "core-js": "^3.6.4",
-    "react": "^16.13.1",
+    "react": "^16.13.0",
-    "react-dom": "^16.13.1",
+    "react-dom": "^16.13.0",
     "wails-react-scripts": "3.0.1-2",
     "react-modal": "3.11.2",
     "@wailsapp/runtime": "^1.0.10"

cmd/templates/create-react-app/frontend/public/index.html

@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
-
+  <head>
-<head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Web site created using create-react-app" />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -23,9 +20,8 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>React App</title>
-</head>
+  </head>
-
+  <body>
-<body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="app"></div>
     <!--
@@ -38,6 +34,5 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-</body>
+  </body>
-
+</html>
-</html>

cmd/templates/create-react-app/frontend/public/manifest.json

@@ -6,16 +6,6 @@
       "src": "favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
     }
   ],
   "start_url": ".",

cmd/templates/create-react-app/frontend/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

cmd/templates/create-react-app/frontend/src/App.css

@@ -3,16 +3,11 @@
 }
 
 .App-logo {
+  animation: App-logo-spin infinite 20s linear;
   height: 40vmin;
   pointer-events: none;
 }
 
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
 .App-header {
   background-color: #282c34;
   min-height: 100vh;

cmd/templates/create-react-app/frontend/src/components/HelloWorld.js

@@ -1,35 +1,48 @@
-import React, { useState } from 'react';
+import React from 'react';
 import Modal from 'react-modal';
 
-function HelloWorld() {
+class HelloWorld extends React.Component {
-	const [showModal, setShowModal] = useState(false);
+  constructor(props, context) {
-	const [result, setResult] = useState(null);
+    super();
+    this.state = {
+      showModal: false
+    };
 
-	const handleOpenModal = () => {
+    this.handleOpenModal = this.handleOpenModal.bind(this);
-		setShowModal(true);
+    this.handleCloseModal = this.handleCloseModal.bind(this);
+  }
 
-		window.backend.basic().then((result) => setResult(result));
+  handleOpenModal () {
-	};
+    this.setState({ showModal: true });
 
-	const handleCloseModal = () => {
+    window.backend.basic().then(result =>
-		setShowModal(false);
+      this.setState({
-	};
+        result
+      })
+    );
+  }
 
-	return (
+  handleCloseModal () {
-		<div className="App">
+    this.setState({ showModal: false });
-			<button onClick={() => handleOpenModal()} type="button">
+  }
-				Hello
+
-      </button>
+  render() {
-			<Modal
+    const { result } = this.state;
-				appElement={document.getElementById("app")}
+    return (
-				isOpen={showModal}
+      <div className="App">
-				contentLabel="Minimal Modal Example"
+        <button onClick={this.handleOpenModal} type="button">
-			>
+          Hello
-				<p>{result}</p>
+        </button>
-				<button onClick={() => handleCloseModal()}>Close Modal</button>
+        <Modal
-			</Modal>
+          isOpen={this.state.showModal}
-		</div>
+          contentLabel="Minimal Modal Example"
-	);
+        >
+        <p>{result}</p>
+        <button onClick={this.handleCloseModal}>Close Modal</button>
+        </Modal>
+      </div>
+    );
+  }
 }
 
 export default HelloWorld;

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

@@ -3,20 +3,9 @@ import ReactDOM from 'react-dom';
 import 'core-js/stable';
 import './index.css';
 import App from './App';
-import * as serviceWorker from './serviceWorker';
 
 import * as Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
-  ReactDOM.render(
+  ReactDOM.render(<App />, document.getElementById('app'));
-    <React.StrictMode>
-      <App />
-    </React.StrictMode>,
-    document.getElementById("app")
-  );
 });
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();

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

@@ -1,8 +1,8 @@
 {
   "name": "React JS",
   "version": "1.0.0",
-  "shortdescription": "Create React App v4 template",
+  "shortdescription": "Create React App v3 template",
-  "description": "Create React App v4 standard tooling",
+  "description": "Create React App v3 standar tooling",
   "install": "npm install",
   "build": "npm run build",
   "author": "bh90210 <ktc@pm.me>",

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

@@ -1,8 +1,9 @@
-import 'core-js/stable';
+
 const runtime = require('@wailsapp/runtime');
 
-// Main entry point
+// We need to wait for runtime.Init to complete before 
-function start() {
+// running our JS
+runtime.Init(() => {
 
 	// Ensure the default app div is 100% wide/high
 	var app = document.getElementById('app');
@@ -19,12 +20,9 @@ function start() {
 	`;
 
 	// Connect button to Go method
-	document.getElementById('button').onclick = function() {
+	document.getElementById('button').onclick = () => {
-		window.backend.basic().then( function(result) {
+		window.backend.basic().then((result) => {
 			document.getElementById('result').innerText = result;
-		});
+		})
-	};
+	} 
-};
+});
-
-// We provide our entrypoint as a callback for runtime.Init
-runtime.Init(start);

cmd/version.go

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

cmd/wails/3_generate.go

@@ -1,37 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/leaanthony/spinner"
-	"github.com/wailsapp/wails/lib/stores"
-)
-
-func init() {
-
-	var generateStores = false
-
-	buildSpinner := spinner.NewSpinner()
-	buildSpinner.SetSpinSpeed(50)
-
-	commandDescription := `This command will generate components`
-	generateCommand := app.Command("generate", "Generate components").
-		LongDescription(commandDescription).
-		BoolFlag("s", "Generate Stores", &generateStores)
-
-	generateCommand.Action(func() error {
-
-		logger.PrintSmallBanner("Generating")
-		fmt.Println()
-
-		if generateStores {
-			err := stores.Generate()
-			if err != nil {
-				return err
-			}
-		}
-
-		return nil
-
-	})
-}

cmd/wails/8_update.go

@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 	"log"
-	"os"
 
 	"github.com/leaanthony/spinner"
+	"github.com/mitchellh/go-homedir"
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -146,7 +146,7 @@ func updateToVersion(targetVersion *cmd.SemanticVersion, force bool) error {
 	updateSpinner.Start("Installing Wails " + desiredVersion)
 
 	// Run command in non module directory
-	homeDir, err := os.UserHomeDir()
+	homeDir, err := homedir.Dir()
 	if err != nil {
 		log.Fatal("Cannot find home directory! Please file a bug report!")
 	}

go.mod

@@ -14,18 +14,20 @@ require (
 	github.com/leaanthony/spinner v0.5.3
 	github.com/mattn/go-colorable v0.1.1 // indirect
 	github.com/mattn/go-isatty v0.0.7 // indirect
+	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	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/image v0.0.0-20200430140353-33d19683fad8
-	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
+	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
-	golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )
 
-go 1.13
+go 1.12

go.sum

@@ -46,6 +46,8 @@ github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
@@ -64,39 +66,25 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 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=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 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-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5 h1:6M3SDHlHHDCx2PcQw3S4KsR170vGqDhJDOmpVd4Hjak=
-golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
+golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862 h1:rM0ROo5vb9AdYJi1110yjWGMej9ITfKddS89P3Fkhug=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+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=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82 h1:shxDsb9Dz27xzk3A0DxP0JuJnZMpKrdg8+E14eiUAX4=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

lib/renderer/bridge/bridge.go

@@ -152,19 +152,12 @@ func (h *Bridge) NotifyEvent(event *messages.EventData) error {
 		// Marshall the data
 		data, err = json.Marshal(event.Data)
 		if err != nil {
-			h.log.Errorf("Cannot marshal JSON data in event: %s ", err.Error())
+			h.log.Errorf("Cannot unmarshall JSON data in event: %s ", err.Error())
 			return err
 		}
 	}
 
-	// Double encode data to ensure everything is escaped correctly.
+	message := fmt.Sprintf("window.wails._.Notify('%s','%s')", event.Name, data)
-	data, err = json.Marshal(string(data))
-	if err != nil {
-		h.log.Errorf("Cannot marshal JSON data in event: %s ", err.Error())
-		return err
-	}
-
-	message := "window.wails._.Notify('" + event.Name + "'," + string(data) + ")"
 	dead := []*session{}
 	for _, session := range h.sessions {
 		err := session.evalJS(message, notifyMessage)

lib/renderer/bridge/renderer-mewn.go

@@ -1,9 +0,0 @@
-package renderer
-
-// Autogenerated by Mewn - Do not alter
-
-import "github.com/leaanthony/mewn"
-
-func init() {
-  mewn.AddAsset(".", "../../runtime/assets/wails.js", "1f8b08000000000000ff94586d8f1bb711fe2b2ba255481f8f91dc14a977c318cee582a838df053ebbfda00a01b53b92e85b915b2e758a20f1bf17b3efba97a2050c7bc519728633cf3c33f468b533a9d7d650c38e8fca45208f216917234f1d3bea1585b95b30077ee74c84df02fe28acf365825bacc42579d4b1e3793c9af246181f43489a4d0637a52acfa96df772cbfb6fcfb815b91c4dfab5e0c5561aee452a817b91c9de550edcb1a317163fd9e974b7fc0aa91719acb481df9c2dc0f943a57604b3db8253cb1ce2d184afc1c72eb0c0bd70727875b233f5ee8c8ca43f146057d1fd61bbb4f9785cff2bbcbdf74e9bf567b51e8f5fb3f85c971f1f55be83987cb4d92e0712187f6d33f9fd77281bb576db6852bbebcfae5f25653a86f1981ae9a9618cff6d0c6d864ca257f43b94125b9922b2bd93198ff18fe82df59b30974e36cea50e94076a7679cef0382f1c75afb9ee38c960a576b9274f235edfc204c6df560e95555cfa201bb6b28e56308ab4890cf322a38e5bde5d17d8b103112c82586a93557e71cb588b2f873132f2399a9fdcf67da7d19f2a1adf43fc82b04330fa059c28c281714073f6494a1ac5264485b3dee225c54695777bd306abae02dc8067149210eea917a59cb040e76718f788cb12228c59ea49823900c61b4f66467bc2e9739f6781b12699c7903489abc34a7e86e56efde2ae5d609dd6ccacec8b4af940e99fca194ce54b7aab81deb573d6bda8950db47e515ee52f6a95ed756c7b1d5befb29cdc1560be7cba7971dfa13dbdd1fb456359bda0b86c0d68395ff4dca7da1c34a1c45cc68663fa962a7d98fd1c7b5ea8436e55164348ce9854afe85e9bcceec55ee9bc5c3a9dade1fdf325b1876569d307f0a20484358b1b25f8c383332a17da3cda07a086712d72306bbff971d2d50cc849023fb482042e2e989ec3821a16e8dfefef6e455d6e7a75a08eb1d0dd2dad11ab28c9ed9af0630e8f90c7866fa12cd51a620803e51dde28a524abb16306a2bc11e90a3043c9aa91ec5b940c855923841a1a4351d98856351e0c0b78cf3d2fcefad2639b9bb64c77793e927e3c6e3e4e27eae5847103fbe83767b7ba04da67de715b675527993d6a692ec825b9d85316f61b9d032de67a5193de8f13867aa92cc17fd65bb03b4f8708b2b4423725572acf236f2372612e48e4f516b2c8eebc883ec1bf7750fa68f6731c910bcd5860dcb3044dc8a3af8ffc55992c8738e50e903a62cb1d94367f84d885c4bb03e6096147f811c94f9bf5adda221633e555fc24cfc82b9a8554f97453c5d29ad2e620aa582330c21008eb33ea7aa4a446a720171543757a073caad15a53f293b3fb129ce8ea6f98c2e5ebba750d1a16f6b2c179ea0e85b7435ac6801b8999fba28dffcbdb0fcea9039d76547fb651acc17f5226b3db7f60a341f4cc278b9798fcdd64f2fdf4ddbbb77ffdeefbef26efde4ddf7c547e235cb597b25011c0b663f4c8d00a5fa3675d77444da44de99549b17f01637ee3ec3e42873f1f0ae800618cf511a62d52519aabb28c5419a9a83d90b040fd4697dc30ee11b197538ebfc555433067cdac9dbd842a8afc50b73fc3f8e5742411f6132925f59772ca42e09bb352b96b4b6533370b897f9d4ef345d31fd0e96d75d30425a2d8951bea06b9bcee3be9139ccd17a2cc75da7aa4dc7ab705e34b562fd329b2af3c9a015221248a127804e309f77565df9f39fb80e610f16d5dc33efaa50d03417d7261181f4d7a7cd79aa369e89dbeeab24eafda794695a55e9bd36918d49e45a709fcd0dd60c8a6d5ddbdec64735824ed3687038b67ff53bff7dc311cd67050f6384c876ec0604d042b30f4610c0dce110a6032790c7cd83fe4f0c7e9d44b7bfd2ac75fe5f116f63fd5b4113f9f8fe60b915a932a4f8d288b5c7b4a0461d56797c4f3939118a16d45d3ae15393949dc0fade0729ab80b39adadd40f04dc377aa096b141729b6a21ad139693489711968e8a1e55aeb3e8ab7a5465ea74e1239d81f17aa5c109c258e2e776814c3fb70b790c5519cded22d4ad1c44610bca1aabfabf5ad5ff9f55bd904ff80afbf0e0d1d4c2a6ab910a037d6e938e6f0df7c8b3dd8cd9f799b3f20769705a5cbf20edb921701f280bbc2590e7d94e8ccc20b5197cf934bbb2dbc21a3098780745ae52a0dffeabbcf876cd0961fdd27c72f94e5dae16c7b701457ffed3b80a823b1c1b4a28942b713e694a12dacb9399a943895a51a1ca12326c91ed0015475dfc413483072722fad8cc2011611d34595293ec8efabaa9d7196c38c4c93ac278aaceb895450bb7b6cf4bd20625faa6b3ea38f9a6cab983b52e3d64a3d188b496cedba61e5ac5ee9a8372ed4060c5591f673c831c3c44e8056f4e786f45dddc69b3c0625ca9ba3c0581f4c802bfb55eaf0ef1b39e83dcdcd395af58bca159c6ebc2ab961ae21a561eaea31fd56c8b95cb30757a983a18a42ea3e76943c7a2128cc7cc99ca3d115d238347c8ec91ac0839d8ae6b51cdc663dff287e35316aac6e343e01fb2ecbe2aa92737ac2f95d9b42a8fe6e9799d03fea2a4ae424c8cf0f0879786779a4b9b1d903dc164571b9d67880e188fafab21686630de57f7f72fb0deabb6fc2107c212c042fce0bdd3cb9d074a90d7092768ffdbb42c09e3202addfb0d807f3ffc21d2b2fc5cf919c3996f4f6ca2ceadcda07abcf7c20da8ec74ea7eaec137ce953f1d3eab6af0a30495080e3aeccc427d6bede319867af6dbd50dc2da803b8b80aebb3c4e82fc561e6fec3a76bc19d262cbabe496f1f1ce3cc9d25df368bd331f77b9d7450ef11dbfde6a1f5ff35f4139bf04759ed9fef184f34a728f3818f056554433e3c13daabc7aa3227b399cb5bbd5e1b08db34860950f1fd20763f739646b889fbcbb466866309365dd2ca6fa4dd1cee0b78936ade3035e309c7c831c8707518cd2eff1d7c18c32434386b27075f6c6e3b7ac6dc1d654257efe1f569e57cf8ee1167163d7a2e9456fdebc79135da9dd7ae3a32f6653314956134e8432c2f86b5b7bc2c4d9e835ad2f9f6e50035ed7b8d106a25b8b5afe75ad2b9befb6a6d173afeb5521401dcb02bfc687a0cecb185fcb901116162cf94f000000ffff04075a367c140000")
-}

lib/renderer/webview.go

@@ -329,14 +329,7 @@ func (w *WebView) NotifyEvent(event *messages.EventData) error {
 		}
 	}
 
-	// Double encode data to ensure everything is escaped correctly.
+	message := fmt.Sprintf("wails._.Notify('%s','%s')", event.Name, data)
-	data, err = json.Marshal(string(data))
-	if err != nil {
-		w.log.Errorf("Cannot marshal JSON data in event: %s ", err.Error())
-		return err
-	}
-
-	message := "window.wails._.Notify('" + event.Name + "'," + string(data) + ")"
 	return w.evalJS(message)
 }
 

lib/renderer/webview/webview.h

@@ -447,7 +447,6 @@ struct webview_priv
           }
           gtk_file_filter_set_name(file_filter, filter);
           gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), file_filter);
-          g_strfreev(filters);
       }
       gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE);
       gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE);

lib/stores/generate.go

@@ -1,14 +0,0 @@
-// Package stores
-package stores
-
-import "os"
-
-// Generate stores that are found in the project
-func Generate() error {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	ParseProject(cwd)
-	return nil
-}

lib/stores/parse.go

@@ -1,442 +0,0 @@
-package stores
-
-import (
-	"fmt"
-	"go/ast"
-	"os"
-	"strings"
-
-	"github.com/leaanthony/slicer"
-	"golang.org/x/tools/go/packages"
-)
-
-var internalMethods = slicer.String([]string{"WailsInit", "Wails Shutdown"})
-
-var structCache = make(map[string]*ParsedStruct)
-var boundStructs = make(map[string]*ParsedStruct)
-var boundMethods = []string{}
-var boundStructPointerLiterals = []string{}
-var boundStructLiterals = slicer.StringSlicer{}
-var boundVariables = slicer.StringSlicer{}
-var app = ""
-var structPointerFunctionDecls = make(map[string]string)
-var structFunctionDecls = make(map[string]string)
-var variableStructDecls = make(map[string]string)
-var variableFunctionDecls = make(map[string]string)
-
-type Parameter struct {
-	Name string
-	Type string
-}
-
-type ParsedMethod struct {
-	Struct   string
-	Name     string
-	Comments []string
-	Inputs   []*Parameter
-	Returns  []*Parameter
-}
-
-type ParsedStruct struct {
-	Name    string
-	Methods []*ParsedMethod
-}
-
-type BoundStructs []*ParsedStruct
-
-func ParseProject(projectPath string) {
-
-	cfg := &packages.Config{Mode: packages.NeedFiles | packages.NeedSyntax | packages.NeedTypesInfo}
-	pkgs, err := packages.Load(cfg, projectPath)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "load: %v\n", err)
-		os.Exit(1)
-	}
-	if packages.PrintErrors(pkgs) > 0 {
-		os.Exit(1)
-	}
-
-	// Iterate the packages
-	for _, pkg := range pkgs {
-
-		// Iterate the files
-		for _, file := range pkg.Syntax {
-
-			var wailsPkgVar = ""
-
-			ast.Inspect(file, func(n ast.Node) bool {
-				switch x := n.(type) {
-				// Parse import declarations
-				case *ast.ImportSpec:
-					// Determine what wails has been imported as
-					if x.Path.Value == `"github.com/wailsapp/wails/v2"` {
-						wailsPkgVar = x.Name.Name
-					}
-				// Parse calls. We are looking for app.Bind() calls
-				case *ast.CallExpr:
-					f, ok := x.Fun.(*ast.SelectorExpr)
-					if ok {
-						n, ok := f.X.(*ast.Ident)
-						if ok {
-							//Check this is the Bind() call associated with the app variable
-							if n.Name == app && f.Sel.Name == "Bind" {
-								if len(x.Args) == 1 {
-									ce, ok := x.Args[0].(*ast.CallExpr)
-									if ok {
-										n, ok := ce.Fun.(*ast.Ident)
-										if ok {
-											// We found a bind method using a function call
-											// EG: app.Bind( newMyStruct() )
-											boundMethods = append(boundMethods, n.Name)
-										}
-									} else {
-										// We also want to check for Bind( &MyStruct{} )
-										ue, ok := x.Args[0].(*ast.UnaryExpr)
-										if ok {
-											if ue.Op.String() == "&" {
-												cl, ok := ue.X.(*ast.CompositeLit)
-												if ok {
-													t, ok := cl.Type.(*ast.Ident)
-													if ok {
-														// We have found Bind( &MyStruct{} )
-														boundStructPointerLiterals = append(boundStructPointerLiterals, t.Name)
-													}
-												}
-											}
-										} else {
-											// Let's check when the user binds a struct,
-											// rather than a struct pointer: Bind( MyStruct{} )
-											// We do this to provide better hints to the user
-											cl, ok := x.Args[0].(*ast.CompositeLit)
-											if ok {
-												t, ok := cl.Type.(*ast.Ident)
-												if ok {
-													boundStructLiterals.Add(t.Name)
-												}
-											} else {
-												// Also check for when we bind a variable
-												// myVariable := &MyStruct{}
-												// app.Bind( myVariable )
-												i, ok := x.Args[0].(*ast.Ident)
-												if ok {
-													boundVariables.Add(i.Name)
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-
-				// We scan assignments for a number of reasons:
-				//   * Determine the variable containing the main application
-				//   * Determine the type of variables that get used in Bind()
-				//   * Determine the type of variables that get created with var := &MyStruct{}
-				case *ast.AssignStmt:
-					for _, rhs := range x.Rhs {
-						ce, ok := rhs.(*ast.CallExpr)
-						if ok {
-							se, ok := ce.Fun.(*ast.SelectorExpr)
-							if ok {
-								i, ok := se.X.(*ast.Ident)
-								if ok {
-									// Have we found the wails package name?
-									if i.Name == wailsPkgVar {
-										// Check we are calling a function to create the app
-										if se.Sel.Name == "CreateApp" || se.Sel.Name == "CreateAppWithOptions" {
-											if len(x.Lhs) == 1 {
-												i, ok := x.Lhs[0].(*ast.Ident)
-												if ok {
-													// Found the app variable name
-													app = i.Name
-												}
-											}
-										}
-									}
-								}
-							} else {
-								// Check for function assignment
-								// a := newMyStruct()
-								fe, ok := ce.Fun.(*ast.Ident)
-								if ok {
-									if len(x.Lhs) == 1 {
-										i, ok := x.Lhs[0].(*ast.Ident)
-										if ok {
-											// Store the variable -> Function mapping
-											// so we can later resolve the type
-											variableFunctionDecls[i.Name] = fe.Name
-										}
-									}
-								}
-							}
-						} else {
-							// Check for literal assignment of struct
-							// EG: myvar := MyStruct{}
-							ue, ok := rhs.(*ast.UnaryExpr)
-							if ok {
-								cl, ok := ue.X.(*ast.CompositeLit)
-								if ok {
-									t, ok := cl.Type.(*ast.Ident)
-									if ok {
-										if len(x.Lhs) == 1 {
-											i, ok := x.Lhs[0].(*ast.Ident)
-											if ok {
-												variableStructDecls[i.Name] = t.Name
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				// We scan for functions to build up a list of function names
-				// for a number of reasons:
-				//   * Determine which functions are struct methods that are bound
-				//   * Determine
-				case *ast.FuncDecl:
-					if x.Recv != nil {
-						// This is a struct method
-						for _, field := range x.Recv.List {
-							se, ok := field.Type.(*ast.StarExpr)
-							if ok {
-								// This is a struct pointer method
-								i, ok := se.X.(*ast.Ident)
-								if ok {
-									// We want to ignore Internal functions
-									if internalMethods.Contains(x.Name.Name) {
-										continue
-									}
-									// If we haven't already found this struct,
-									// Create a placeholder in the cache
-									parsedStruct := structCache[i.Name]
-									if parsedStruct == nil {
-										structCache[i.Name] = &ParsedStruct{
-											Name: i.Name,
-										}
-										parsedStruct = structCache[i.Name]
-									}
-
-									// If this method is Public
-									if string(x.Name.Name[0]) == strings.ToUpper((string(x.Name.Name[0]))) {
-										structMethod := &ParsedMethod{
-											Struct: i.Name,
-											Name:   x.Name.Name,
-										}
-										// Check if the method has comments.
-										// If so, save it with the parsed method
-										if x.Doc != nil {
-											for _, comment := range x.Doc.List {
-												stringComment := strings.TrimPrefix(comment.Text, "//")
-												structMethod.Comments = append(structMethod.Comments, strings.TrimSpace(stringComment))
-											}
-										}
-
-										// Save the input parameters
-										if x.Type.Params != nil {
-											for _, inputField := range x.Type.Params.List {
-												t, ok := inputField.Type.(*ast.Ident)
-												if !ok {
-													continue
-												}
-												for _, name := range inputField.Names {
-													structMethod.Inputs = append(structMethod.Inputs, &Parameter{Name: name.Name, Type: t.Name})
-												}
-											}
-										}
-
-										// Save the output parameters
-										if x.Type.Results != nil {
-											for _, outputField := range x.Type.Results.List {
-												t, ok := outputField.Type.(*ast.Ident)
-												if !ok {
-													continue
-												}
-												if len(outputField.Names) == 0 {
-													structMethod.Returns = append(structMethod.Returns, &Parameter{Type: t.Name})
-												} else {
-													for _, name := range outputField.Names {
-														structMethod.Returns = append(structMethod.Returns, &Parameter{Name: name.Name, Type: t.Name})
-													}
-												}
-											}
-										}
-
-										// Append this method to the parsed struct
-										parsedStruct.Methods = append(parsedStruct.Methods, structMethod)
-
-									}
-								}
-							}
-						}
-					} else {
-						// This is a function declaration
-						// We care about its name and return type
-						// This will allow us to resolve types later
-						functionName := x.Name.Name
-
-						// Look for one that returns a single value
-						if x.Type != nil && x.Type.Results != nil && x.Type.Results.List != nil {
-							if len(x.Type.Results.List) == 1 {
-								// Check for *struct
-								t, ok := x.Type.Results.List[0].Type.(*ast.StarExpr)
-								if ok {
-									s, ok := t.X.(*ast.Ident)
-									if ok {
-										// println("*** Function", functionName, "found which returns: *"+s.Name)
-										structPointerFunctionDecls[functionName] = s.Name
-									}
-								} else {
-									// Check for functions that return a struct
-									// This is to help us provide hints if the user binds a struct
-									t, ok := x.Type.Results.List[0].Type.(*ast.Ident)
-									if ok {
-										// println("*** Function", functionName, "found which returns: "+t.Name)
-										structFunctionDecls[functionName] = t.Name
-									}
-								}
-							}
-						}
-					}
-				}
-				return true
-			})
-			// spew.Dump(file)
-		}
-	}
-
-	/***** Update bound structs ******/
-
-	// Resolve bound Methods
-	for _, method := range boundMethods {
-		s, ok := structPointerFunctionDecls[method]
-		if !ok {
-			s, ok = structFunctionDecls[method]
-			if !ok {
-				println("Fatal: Bind statement using", method, "but cannot find", method, "declaration")
-			} else {
-				println("Fatal: Cannot bind struct using method `" + method + "` because it returns a struct (" + s + "). Return a pointer to " + s + " instead.")
-			}
-			os.Exit(1)
-		}
-		structDefinition := structCache[s]
-		if structDefinition == nil {
-			println("Fatal: Bind statement using `"+method+"` but cannot find struct", s, "definition")
-			os.Exit(1)
-		}
-		boundStructs[s] = structDefinition
-	}
-
-	// Resolve bound vars
-	for _, structLiteral := range boundStructPointerLiterals {
-		s, ok := structCache[structLiteral]
-		if !ok {
-			println("Fatal: Bind statement using", structLiteral, "but cannot find", structLiteral, "declaration")
-			os.Exit(1)
-		}
-		boundStructs[structLiteral] = s
-	}
-
-	// Resolve bound variables
-	boundVariables.Each(func(variable string) {
-		v, ok := variableStructDecls[variable]
-		if !ok {
-			method, ok := variableFunctionDecls[variable]
-			if !ok {
-				println("Fatal: Bind statement using variable `" + variable + "` which does not resolve to a struct pointer")
-				os.Exit(1)
-			}
-
-			// Resolve function name
-			v, ok = structPointerFunctionDecls[method]
-			if !ok {
-				v, ok = structFunctionDecls[method]
-				if !ok {
-					println("Fatal: Bind statement using", method, "but cannot find", method, "declaration")
-				} else {
-					println("Fatal: Cannot bind variable `" + variable + "` because it resolves to a struct (" + v + "). Return a pointer to " + v + " instead.")
-				}
-				os.Exit(1)
-			}
-
-		}
-
-		s, ok := structCache[v]
-		if !ok {
-			println("Fatal: Bind statement using variable `" + variable + "` which resolves to a `" + v + "` but cannot find its declaration")
-			os.Exit(1)
-		}
-		boundStructs[v] = s
-
-	})
-
-	// Check for struct literals
-	boundStructLiterals.Each(func(structName string) {
-		println("Fatal: Cannot bind struct using struct literal `" + structName + "{}`. Create a pointer to " + structName + " instead.")
-		os.Exit(1)
-	})
-
-	// Check for bound variables
-	// boundVariables.Each(func(varName string) {
-	// 	println("Fatal: Cannot bind struct using struct literal `" + structName + "{}`. Create a pointer to " + structName + " instead.")
-	// })
-
-	// spew.Dump(boundStructs)
-	// os.Exit(0)
-
-	// }
-	// Inspect the AST and print all identifiers and literals.
-
-	println("export {")
-
-	noOfStructs := len(boundStructs)
-	structCount := 0
-	for _, s := range boundStructs {
-		structCount++
-		println()
-		println("  " + s.Name + ": {")
-		println()
-		noOfMethods := len(s.Methods)
-		for methodCount, m := range s.Methods {
-			println("   /****************")
-			for _, comment := range m.Comments {
-				println("    *", comment)
-			}
-			if len(m.Comments) > 0 {
-				println("    *")
-			}
-			inputNames := ""
-			for _, input := range m.Inputs {
-				println("    * @param {"+input.Type+"}", input.Name)
-				inputNames += input.Name + ", "
-			}
-			print("    * @return Promise<")
-			for _, output := range m.Returns {
-				print(output.Type + "|")
-			}
-			println("Error>")
-			println("    *")
-			println("    ***/")
-			if len(inputNames) > 2 {
-				inputNames = inputNames[:len(inputNames)-2]
-			}
-			println("   ", m.Name+": function("+inputNames+") {")
-			println("     return window.backend." + s.Name + "." + m.Name + "(" + inputNames + ");")
-			print("    }")
-			if methodCount < noOfMethods-1 {
-				print(",")
-			}
-			println()
-			println()
-		}
-		print("  }")
-		if structCount < noOfStructs-1 {
-			print(",")
-		}
-		println()
-	}
-	println()
-	println("}")
-	println()
-
-}

runtime/filesystem.go

@@ -1,9 +1,9 @@
 package runtime
 
-import "os"
+import homedir "github.com/mitchellh/go-homedir"
 
 // FileSystem exposes file system utilities to the runtime
-type FileSystem struct{}
+type FileSystem struct {}
 
 // NewFileSystem creates a new FileSystem struct
 func NewFileSystem() *FileSystem {
@@ -12,5 +12,5 @@ func NewFileSystem() *FileSystem {
 
 // HomeDir returns the user's home directory
 func (r *FileSystem) HomeDir() (string, error) {
-	return os.UserHomeDir()
+	return homedir.Dir()
 }

runtime/js/package.json

@@ -29,15 +29,15 @@
   },
   "homepage": "https://github.com/wailsapp/runtime#readme",
   "devDependencies": {
-    "@babel/cli": "^7.11.5",
+    "@babel/cli": "^7.5.0",
-    "@babel/core": "^7.11.5",
+    "@babel/core": "^7.5.4",
-    "@babel/plugin-transform-object-assign": "^7.10.4",
+    "@babel/plugin-transform-object-assign": "^7.2.0",
-    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-env": "^7.5.4",
-    "babel-loader": "^8.1.0",
+    "babel-loader": "^8.0.6",
-    "babel-preset-minify": "^0.5.1",
+    "babel-preset-minify": "^0.5.0",
-    "core-js": "^3.6.5",
+    "core-js": "^3.1.4",
-    "eslint": "^7.8.1",
+    "eslint": "^6.5.1",
-    "webpack": "^4.44.1",
+    "webpack": "^4.35.3",
-    "webpack-cli": "^3.3.12"
+    "webpack-cli": "^3.3.5"
   }
 }