removed quote db for now. added vue basic

move webview out to seperate project

.gitignore

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

assets/default/wailsbridge.js

@@ -30,6 +30,7 @@ window.wailsbridge = {
   overlayCSS:
     ".wails-reconnect-overlay{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,.6);font-family:sans-serif;display:none;z-index:999999}.wails-reconnect-overlay-content{padding:20px 30px;text-align:center;width:20em;position:relative;height:14em;border-radius:1em;margin:5% auto 0;background-color:#fff;box-shadow:1px 1px 20px 3px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAuCAMAAACPpbA7AAAAqFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQAAAAAAAAEBAQAAAAAAAAAAAAEBAQEBAQDAwMBAQEAAAABAQEAAAAAAAAAAAABAQEAAAAAAAACAgICAgIBAQEAAAAAAAAAAAAAAAAAAAAAAAABAQEAAAACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBQWKCj6oAAAAN3RSTlMALiIqDhkGBAswJjP0GxP6NR4W9/ztjRDMhWU50G9g5eHXvbZ9XEI9xZTcqZl2aldKo55QwoCvZUgzhAAAAs9JREFUSMeNleeWqjAUhU0BCaH3Itiw9zKT93+zG02QK1hm/5HF+jzZJ6fQe6cyXE+jg9X7o9wxuylIIf4Tv2V3+bOrEXnf8dwQ/KQIGDN2/S+4OmVCVXL/ScBnfibxURqIByP/hONE8r8T+bDMlQ98KSl7Y8hzjpS8v1qtDh8u5f8KQpGpfnPPhqG8JeogN37Hq9eaN2xRhIwAaGnvws8F1ShxqK5ob2twYi1FAMD4rXsYtnC/JEiRbl4cUrCWhnMCLRFemXezXbb59QK4WASOsm6n2W1+4CBT2JmtzQ6fsrbGubR/NFbd2g5Y179+5w/GEHaKsHjYCet7CgrXU3txarNC7YxOVJtIj4/ERzMdZfzc31hp+8cD6eGILgarZY9uZ12hAs03vfBD9C171gS5Omz7OcvxALQIn4u8RRBBBcsi9WW2woO9ipLgfzpYlggg3ZRdROUC8KT7QLqq3W9KB5BbdFVg4929kdwp6+qaZnMCCNBdj+NyN1W885Ry/AL3D4AQbsVV4noCiM/C83kyYq80XlDAYQtralOiDzoRAHlotWl8q2tjvYlOgcg1A8jEApZa+C06TBdAz2Qv0wu11I/zZOyJQ6EwGez2P2b8PIQr1hwwnAZsAxwA4UAYOyXUxM/xp6tHAn4GUmPGM9R28oVxgC0e/zQJJI6DyhyZ1r7uzRQhpcW7x7vTaWSzKSG6aep77kroTEl3U81uSVaUTtgEINfC8epx+Q4F9SpplHG84Ek6m4RAq9/TLkOBrxyeuddZhHvGIp1XXfFy3Z3vtwNblKGiDn+J+92vwwABHghj7HnzlS1H5kB49AZvdGCFgiBPq69qfXPr3y++yilF0ON4R8eR7spAsLpZ95NqAW5tab1c4vkZm6aleajchMwYTdILQQTwE2OV411ZM9WztDjPql12caBi6gDpUKmDd4U1XNdQxZ4LIXQ5/Tr4P7I9tYcFrDK3AAAAAElFTkSuQmCC);background-repeat:no-repeat;background-position:center}.wails-reconnect-overlay-title{font-size:2em}.wails-reconnect-overlay-message{font-size:1.3em}.wails-reconnect-overlay-loadingspinner{pointer-events:none;width:2.5em;height:2.5em;border:.4em solid transparent;border-color:#3E67EC #eee #eee;border-radius:50%;animation:loadingspin 1s linear infinite;margin:auto;padding:2.5em}@keyframes loadingspin{100%{transform:rotate(360deg)}}",
   log: function(message) {
+    // eslint-disable-next-line
     console.log(
       "%c wails bridge %c " + message + " ",
       "background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem",
@@ -188,7 +189,7 @@ function startBridge() {
       // Call back
       case "c":
         var callbackData = message.data.slice(1);
-        log("Callback = " + callbackData);
+        window.wailsbridge.log("Callback = " + callbackData);
         window.wails._.callback(callbackData);
         break;
     }

assets/default/wailsbridge.prod.js

@@ -11,7 +11,7 @@ export default {
   // Passes the main Wails object to the callback if given.
   Start: function(callback) {
     if (callback) {
-      callback();
+      window.wails.events.on("wails:ready", callback);
     }
   }
 };

cmd/helpers.go

@@ -70,7 +70,14 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string) er
 		buildCommand.Add("-a")
 	}
 
-	buildCommand.AddSlice([]string{"-ldflags", "-X github.com/wailsapp/wails.BuildMode=" + buildMode})
+	// Setup ld flags
+	ldflags := "-w -s "
+	if buildMode == "debug" {
+		ldflags = ""
+	}
+	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
+
+	buildCommand.AddSlice([]string{"-ldflags", ldflags})
 	err := NewProgramHelper().RunCommandArray(buildCommand.AsSlice())
 	if err != nil {
 		packSpinner.Error()
@@ -127,7 +134,7 @@ func CheckPackr() (err error) {
 }
 
 // InstallFrontendDeps attempts to install the frontend dependencies based on the given options
-func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool) error {
+func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool, caller string) error {
 
 	// Install frontend deps
 	err := os.Chdir(projectOptions.FrontEnd.Dir)
@@ -182,6 +189,9 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	}
 
 	bridgeFile := "wailsbridge.prod.js"
+	if caller == "serve" {
+		bridgeFile = "wailsbridge.js"
+	}
 
 	// Copy bridge to project
 	_, filename, _, _ := runtime.Caller(1)

cmd/templates/vuebasic/frontend/README.md

@@ -1,29 +1,35 @@
-# frontend
+# vue basic
 
 ## Project setup
+
 ```
 npm install
 ```
 
 ### Compiles and hot-reloads for development
+
 ```
 npm run serve
 ```
 
 ### Compiles and minifies for production
+
 ```
 npm run build
 ```
 
 ### Run your tests
+
 ```
 npm run test
 ```
 
 ### Lints and fixes files
+
 ```
 npm run lint
 ```
 
 ### Customize configuration
+
 See [Configuration Reference](https://cli.vuejs.org/config/).

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

@@ -0,0 +1 @@
+2b79f883dc856221fc3265755d610e40

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

@@ -0,0 +1,49 @@
+{
+  "name": "{{.NPMProjectName}}",
+  "author": "{{.Author.Name}}<{{.Author.Email}}>",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "core-js": "^2.6.4",
+    "vue": "^2.5.22"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^3.4.0",
+    "@vue/cli-plugin-eslint": "^3.4.0",
+    "@vue/cli-service": "^3.4.0",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.8.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "eventsource-polyfill": "^0.9.6",
+    "vue-template-compiler": "^2.5.21",
+    "webpack-hot-middleware": "^2.24.3"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "rules": {},
+    "parserOptions": {
+      "parser": "babel-eslint"
+    }
+  },
+  "postcss": {
+    "plugins": {
+      "autoprefixer": {}
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}

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

@@ -5,11 +5,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>frontend</title>
+    <title>my-vue-app-01</title>
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but frontend doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but my-vue-app-01 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

cmd/templates/vuebasic/frontend/src/App.vue

@@ -1,22 +1,18 @@
 <template>
   <div id="app">
     <img alt="Wails logo" src="./assets/images/logo.png" class="logo zoomIn">
-    <HelloWorld msg="Welcome to Your Wails App!"/>
-    <Quote/>
+    <HelloWorld/>
   </div>
 </template>
 
 <script>
 import HelloWorld from "./components/HelloWorld.vue";
-import Quote from "./components/Quote.vue";
 import "./assets/css/main.css";
 
 export default {
   name: "app",
   components: {
-    HelloWorld,
-    Quote
+    HelloWorld
   }
 };
 </script>
-

cmd/templates/vuebasic/frontend/src/assets/css/main.css

@@ -10,21 +10,6 @@
 html {
   height: 100%;
   overflow: hidden;
-  /* https://leaverou.github.io/css3patterns/#carbon */
-  background: linear-gradient(27deg, #151515 5px, transparent 5px) 0 5px,
-    linear-gradient(207deg, #151515 5px, transparent 5px) 10px 0,
-    linear-gradient(27deg, #222 5px, transparent 5px) 0 10px,
-    linear-gradient(207deg, #222 5px, transparent 5px) 10px 5px,
-    linear-gradient(90deg, #1b1b1b 10px, transparent 10px),
-    linear-gradient(
-      #1d1d1d 25%,
-      #1a1a1a 25%,
-      #1a1a1a 50%,
-      transparent 50%,
-      transparent 75%,
-      #242424 75%,
-      #242424
-    );
   background-color: #131313;
   background-size: 20px 20px;
 }

cmd/templates/vuebasic/frontend/src/components/HelloWorld.vue

@@ -0,0 +1,55 @@
+<template>
+  <div class="container">
+    <h1>{{message}}</h1>
+    <a @click="getMessage">Press Me!</a>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      message: " "
+    };
+  },
+  methods: {
+    getMessage: function() {
+      var self = this;
+      window.backend.basic().then(result => {
+        self.message = result;
+      });
+    }
+  }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h1 {
+  margin-top: 2em;
+  position: relative;
+  min-height: 5rem;
+  width: 100%;
+}
+a:hover {
+  font-size: 1.7em;
+  border-color: blue;
+  background-color: blue;
+  color: white;
+  border: 3px solid white;
+  border-radius: 10px;
+  padding: 9px;
+  cursor: pointer;
+  transition: 500ms;
+}
+a {
+  font-size: 1.7em;
+  border-color: white;
+  background-color: #121212;
+  color: white;
+  border: 3px solid white;
+  border-radius: 10px;
+  padding: 9px;
+  cursor: pointer;
+}
+</style>

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

@@ -0,0 +1,12 @@
+import Vue from "vue";
+import App from "./App.vue";
+
+Vue.config.productionTip = false;
+
+import Bridge from "./wailsbridge";
+
+Bridge.Start(() => {
+  new Vue({
+    render: h => h(App)
+  }).$mount("#app");
+});

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

@@ -0,0 +1,17 @@
+/*
+    Wails Bridge (c) 2019-present Lea Anthony
+
+    This prod version is to get around having to rewrite your code
+    for production. When doing a release build, this file will be used 
+    instead of the full version.
+*/
+
+export default {
+  // The main function
+  // Passes the main Wails object to the callback if given.
+  Start: function(callback) {
+    if (callback) {
+      window.wails.events.on("wails:ready", callback);
+    }
+  }
+};

cmd/templates/vuebasic/frontend/vue.config.js

@@ -0,0 +1,43 @@
+let cssConfig = {};
+
+if (process.env.NODE_ENV == "production") {
+  cssConfig = {
+    extract: {
+      filename: "[name].css",
+      chunkFilename: "[name].css"
+    }
+  };
+}
+
+module.exports = {
+  chainWebpack: config => {
+    let limit = 9999999999999999;
+    config.module
+      .rule("images")
+      .test(/\.(png|gif|jpg)(\?.*)?$/i)
+      .use("url-loader")
+      .loader("url-loader")
+      .tap(options => Object.assign(options, { limit: limit }));
+    config.module
+      .rule("fonts")
+      .test(/\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/i)
+      .use("url-loader")
+      .loader("url-loader")
+      .options({
+        limit: limit
+      });
+  },
+  css: cssConfig,
+  configureWebpack: {
+    output: {
+      filename: "[name].js"
+    },
+    optimization: {
+      splitChunks: false
+    }
+  },
+  devServer: {
+    disableHostCheck: true,
+    host: "localhost"
+  }
+};

cmd/templates/vuebasic/main.go.template

@@ -5,6 +5,10 @@ import (
 	"github.com/wailsapp/wails"
 )
 
+func basic() string {
+	return "Hello World!"
+}
+
 func main() {
 
 	assets := packr.NewBox("./frontend/dist")
@@ -16,6 +20,6 @@ func main() {
 		JS:     wails.BoxString(&assets, "app.js"),
 		CSS:    wails.BoxString(&assets, "app.css"),
 	})
-	app.Bind(newQuotesCollection())
+	app.Bind(basic)
 	app.Run()
 }

cmd/templates/vuebasic/template.json

@@ -1,5 +1,5 @@
 {
-  "name": "Vue2/Webpack",
+  "name": "Vue2/Webpack Basic",
   "shortdescription": "A basic Vue2/WebPack4 template",
   "description": "A basic template using Vue 2 and bundled using Webpack 4",
   "author": "Lea Anthony<lea.anthony@gmail.com>",

cmd/templates/vuewebpack/frontend/.browserslistrc

@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not ie <= 8

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

@@ -1,18 +0,0 @@
-{
-  "name": "{{.NPMProjectName}}",
-  "author": "{{.Author.Name}}<{{.Author.Email}}>",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
-  },
-  "dependencies": {
-    "vue": "^2.5.17"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.1.1",
-    "@vue/cli-service": "^3.1.4",
-    "vue-template-compiler": "^2.5.17"
-  }
-}

cmd/templates/vuewebpack/frontend/postcss.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  plugins: {
-    autoprefixer: {}
-  }
-}

cmd/templates/vuewebpack/frontend/src/assets/css/quote.css

@@ -1,79 +0,0 @@
-/**
-  Credit: https://codepen.io/harmputman/pen/IpAnb
-**/
-
-body {
-  font: normal 300 1em/1.5em sans-serif;
-}
-
-.container {
-  background: #fff;
-  width: 100%;
-  max-width: 480px;
-  min-width: 320px;
-  margin: 2em auto 0;
-  padding: 1.5em;
-  opacity: 0.8;
-  border-radius: 1em;
-  border-color: #117;
-}
-
-p {
-  margin-bottom: 1.5em;
-}
-p:last-child {
-  margin-bottom: 0;
-}
-
-blockquote {
-  display: block;
-  border-width: 2px 0;
-  border-style: solid;
-  border-color: #eee;
-  padding: 1.5em 0 0.5em;
-  margin: 1.5em 0;
-  position: relative;
-  color: #117;
-}
-blockquote:before {
-  content: "\201C";
-  position: absolute;
-  top: 0;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  background: #fff;
-  width: 3rem;
-  height: 2rem;
-  font: 6em/1.08em sans-serif;
-  color: #666;
-  text-align: center;
-}
-blockquote:after {
-  content: "\2013 \2003" attr(cite);
-  display: block;
-  text-align: right;
-  font-size: 0.875em;
-  color: #e70000;
-}
-
-/* https://fdossena.com/?p=html5cool/buttons/i.frag */
-button {
-  display: inline-block;
-  padding: 0.35em 1.2em;
-  border: 0.1em solid #000;
-  margin: 0 0.3em 0.3em 0;
-  border-radius: 0.12em;
-  box-sizing: border-box;
-  text-decoration: none;
-  font-family: "Roboto", sans-serif;
-  font-weight: 300;
-  font-size: 1em;
-  color: #000;
-  text-align: center;
-  transition: all 0.2s;
-}
-button:hover {
-  color: #fff;
-  background-color: #000;
-  cursor: pointer;
-}

cmd/templates/vuewebpack/frontend/src/components/HelloWorld.vue

@@ -1,38 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <p></p>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "HelloWorld",
-  props: {
-    msg: String
-  }
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-.hello {
-  margin-top: 2em;
-  position: relative;
-  width: 100%;
-}
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: gold;
-}
-</style>

cmd/templates/vuewebpack/frontend/src/components/Quote.vue

@@ -1,58 +0,0 @@
-<template>
-  <div class="container">
-    <blockquote v-if="quote != null" :cite="quote.person">{{ quote.text }}</blockquote>
-    <p></p>
-    <button @click="getNewQuote()">Get new Quote</button>
-  </div>
-</template>
-
-<script>
-import "../assets/css/quote.css";
-import { eventBus } from "../main";
-
-export default {
-  data() {
-    return {
-      quote: null
-    };
-  },
-  methods: {
-    getNewQuote: function() {
-      var self = this;
-      backend.QuotesCollection.GetQuote().then(result => {
-        self.quote = result;
-      });
-    }
-  },
-  created() {
-    if( !backend ) {
-    eventBus.$on("ready", this.getNewQuote);
-    } else {
-      this.getNewQuote();
-    }
-  }
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-.hello {
-  margin-top: 2em;
-  position: relative;
-  width: 100%;
-}
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: gold;
-}
-</style>

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

@@ -1,13 +0,0 @@
-import Vue from "vue";
-export const eventBus = new Vue();
-
-import App from "./App.vue";
-new Vue({
-  render: h => h(App)
-}).$mount("#app");
-
-import Bridge from "./wailsbridge";
-Bridge.OnReady(() => {
-  eventBus.$emit("ready");
-});
-Bridge.Start();

cmd/templates/vuewebpack/frontend/vue.config.js

@@ -1,35 +0,0 @@
-
-module.exports = {
-  chainWebpack: (config) => {
-    let limit = 9999999999999999;
-    config.module
-      .rule('images')
-      .test(/\.(png|gif|jpg)(\?.*)?$/i)
-      .use('url-loader')
-      .loader('url-loader')
-      .tap(options => Object.assign(options, { limit: limit }));
-    config.module
-      .rule('fonts')
-      .test(/\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/i)
-      .use('url-loader')
-      .loader('url-loader')
-      .options({
-        limit: limit,
-      })
-  },
-  css: {
-    extract: {
-      filename: '[name].css',
-      chunkFilename: '[name].css',
-    }
-  },
-  configureWebpack: {
-    output: {
-      filename: '[name].js',
-    },
-    optimization: {
-      splitChunks: false
-    }
-  },
-
-}

cmd/templates/vuewebpack/quotes.go

@@ -1,61 +0,0 @@
-package main
-
-import (
-	"math/rand"
-	"time"
-)
-
-// Quote holds a single quote and the person who said it
-type Quote struct {
-	Text   string `json:"text"`
-	Person string `json:"person"`
-}
-
-// QuotesCollection holds a collection of quotes!
-type QuotesCollection struct {
-	quotes []*Quote
-}
-
-// AddQuote creates a Quote object with the given inputs and
-// adds it to the Quotes collection
-func (Q *QuotesCollection) AddQuote(text, person string) {
-	Q.quotes = append(Q.quotes, &Quote{Text: text, Person: person})
-}
-
-// GetQuote returns a random Quote object from the Quotes collection
-func (Q *QuotesCollection) GetQuote() *Quote {
-	return Q.quotes[rand.Intn(len(Q.quotes))]
-}
-
-// newQuotesCollection creates a new QuotesCollection
-func newQuotesCollection() *QuotesCollection {
-	result := &QuotesCollection{}
-	rand.Seed(time.Now().Unix())
-	result.AddQuote("Age is an issue of mind over matter. If you don't mind, it doesn't matter", "Mark Twain")
-	result.AddQuote("Anyone who stops learning is old, whether at twenty or eighty. Anyone who keeps learning stays young. The greatest thing in life is to keep your mind young", "Henry Ford")
-	result.AddQuote("Wrinkles should merely indicate where smiles have been", "Mark Twain")
-	result.AddQuote("True terror is to wake up one morning and discover that your high school class is running the country", "Kurt Vonnegut")
-	result.AddQuote("A diplomat is a man who always remembers a woman's birthday but never remembers her age", "Robert Frost")
-	result.AddQuote("As I grow older, I pay less attention to what men say. I just watch what they do", "Andrew Carnegie")
-	result.AddQuote("How incessant and great are the ills with which a prolonged old age is replete", "C. S. Lewis")
-	result.AddQuote("Old age, believe me, is a good and pleasant thing. It is true you are gently shouldered off the stage, but then you are given such a comfortable front stall as spectator", "Confucius")
-	result.AddQuote("Old age has deformities enough of its own. It should never add to them the deformity of vice", "Eleanor Roosevelt")
-	result.AddQuote("Nobody grows old merely by living a number of years. We grow old by deserting our ideals. Years may wrinkle the skin, but to give up enthusiasm wrinkles the soul", "Samuel Ullman")
-	result.AddQuote("An archaeologist is the best husband a woman can have. The older she gets the more interested he is in her", "Agatha Christie")
-	result.AddQuote("All diseases run into one, old age", "Ralph Waldo Emerson")
-	result.AddQuote("Bashfulness is an ornament to youth, but a reproach to old age", "Aristotle")
-	result.AddQuote("Like everyone else who makes the mistake of getting older, I begin each day with coffee and obituaries", "Bill Cosby")
-	result.AddQuote("Age appears to be best in four things old wood best to burn, old wine to drink, old friends to trust, and old authors to read", "Francis Bacon")
-	result.AddQuote("None are so old as those who have outlived enthusiasm", "Henry David Thoreau")
-	result.AddQuote("Every man over forty is a scoundrel", "George Bernard Shaw")
-	result.AddQuote("Forty is the old age of youth fifty the youth of old age", "Victor Hugo")
-	result.AddQuote("You can't help getting older, but you don't have to get old", "George Burns")
-	result.AddQuote("Alas, after a certain age every man is responsible for his face", "Albert Camus")
-	result.AddQuote("Youth is when you're allowed to stay up late on New Year's Eve. Middle age is when you're forced to", "Bill Vaughan")
-	result.AddQuote("Old age is like everything else. To make a success of it, you've got to start young", "Theodore Roosevelt")
-	result.AddQuote("A comfortable old age is the reward of a well-spent youth. Instead of its bringing sad and melancholy prospects of decay, it would give us hopes of eternal youth in a better world", "Maurice Chevalier")
-	result.AddQuote("A man growing old becomes a child again", "Sophocles")
-	result.AddQuote("I will never be an old man. To me, old age is always 15 years older than I am", "Francis Bacon")
-	result.AddQuote("Age considers youth ventures", "Rabindranath Tagore")
-	return result
-}

cmd/version.go

@@ -2,4 +2,4 @@ package cmd
 
 // Version - Wails version
 // ...oO(There must be a better way)
-const Version = "v0.7.2"
+const Version = "v0.8.0"

cmd/wails/4_build.go

@@ -70,7 +70,7 @@ func init() {
 
 		// Install deps
 		if projectOptions.FrontEnd != nil {
-			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
+			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "build")
 			if err != nil {
 				return err
 			}

cmd/wails/6_serve.go

@@ -66,7 +66,7 @@ func init() {
 
 		// Install deps
 		if projectOptions.FrontEnd != nil {
-			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
+			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "serve")
 			if err != nil {
 				return err
 			}

go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/mitchellh/go-homedir v1.0.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/sirupsen/logrus v1.2.0
+	github.com/wailsapp/webview v0.2.0
 	golang.org/x/net v0.0.0-20190107155100-1a61f4433d85 // indirect
 	gopkg.in/AlecAivazis/survey.v1 v1.7.1 // indirect
 )

go.sum

@@ -306,7 +306,12 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
 github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
+github.com/wailsapp/webview v0.0.0-20190206214557-b5fea5042a9e h1:ZT5ZZWHIKrzXWAPME5rcbt1G4sgFyPF9FucugY60jV0=
+github.com/wailsapp/webview v0.0.0-20190206214557-b5fea5042a9e/go.mod h1:XO9HJbKWokDxUYTWQEBCYg95n/To1v7PxvanDNVf8hY=
+github.com/wailsapp/webview v0.2.0 h1:V3j112ECWIo6LSspWKyiBlEbQAhEPu+bnT1AK8eFNr4=
+github.com/wailsapp/webview v0.2.0/go.mod h1:XO9HJbKWokDxUYTWQEBCYg95n/To1v7PxvanDNVf8hY=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/zserge/webview v0.0.0-20190123072648-16c93bcaeaeb/go.mod h1:a1CV8KR4Dd1eP2g+mEijGOp+HKczwdKHWyx0aPHKvo4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

renderer_headless.go

@@ -118,11 +118,6 @@ func (h *Headless) start(conn *websocket.Conn) {
 	wailsRuntime := BoxString(&defaultAssets, "wails.js")
 	h.evalJS(wailsRuntime, wailsRuntimeMessage)
 
-	// Inject the initial JS
-	for _, js := range h.initialisationJS {
-		h.sendMessage(h.theConnection, js)
-	}
-
 	// Inject bindings
 	for _, binding := range h.bindingCache {
 		h.evalJS(binding, bindingMessage)

renderer_webview.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-playground/colors"
 	"github.com/gobuffalo/packr"
-	"github.com/wailsapp/wails/webview"
+	"github.com/wailsapp/webview"
 )
 
 // Window defines the main application window

webview/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Serge Zaitsev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

webview/webview.go

@@ -1,372 +0,0 @@
-// Package wails implements Go bindings to https://github.com/zserge/webview C library.
-// It is a modified version of webview.go from that repository
-
-// Bindings closely repeat the C APIs and include both, a simplified
-// single-function API to just open a full-screen webview window, and a more
-// advanced and featureful set of APIs, including Go-to-JavaScript bindings.
-//
-// The library uses gtk-webkit, Cocoa/Webkit and MSHTML (IE8..11) as a browser
-// engine and supports Linux, MacOS and Windows 7..10 respectively.
-//
-package webview
-
-/*
-#cgo linux openbsd freebsd CFLAGS: -DWEBVIEW_GTK=1
-#cgo linux openbsd freebsd pkg-config: gtk+-3.0 webkit2gtk-4.0
-
-#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1
-#cgo windows LDFLAGS: -lole32 -lcomctl32 -loleaut32 -luuid -lgdi32
-
-#cgo darwin CFLAGS: -DWEBVIEW_COCOA=1 -x objective-c
-#cgo darwin LDFLAGS: -framework Cocoa -framework WebKit
-
-#include <stdlib.h>
-#include <stdint.h>
-#define WEBVIEW_STATIC
-#define WEBVIEW_IMPLEMENTATION
-#include "webview.h"
-
-extern void _webviewExternalInvokeCallback(void *, void *);
-
-static inline void CgoWebViewFree(void *w) {
-	free((void *)((struct webview *)w)->title);
-	free((void *)((struct webview *)w)->url);
-	free(w);
-}
-
-static inline void *CgoWebViewCreate(int width, int height, char *title, char *url, int resizable, int debug) {
-	struct webview *w = (struct webview *) calloc(1, sizeof(*w));
-	w->width = width;
-	w->height = height;
-	w->title = title;
-	w->url = url;
-	w->resizable = resizable;
-	w->debug = debug;
-	w->external_invoke_cb = (webview_external_invoke_cb_t) _webviewExternalInvokeCallback;
-	if (webview_init(w) != 0) {
-		CgoWebViewFree(w);
-		return NULL;
-	}
-	return (void *)w;
-}
-
-static inline int CgoWebViewLoop(void *w, int blocking) {
-	return webview_loop((struct webview *)w, blocking);
-}
-
-static inline void CgoWebViewTerminate(void *w) {
-	webview_terminate((struct webview *)w);
-}
-
-static inline void CgoWebViewExit(void *w) {
-	webview_exit((struct webview *)w);
-}
-
-static inline void CgoWebViewSetTitle(void *w, char *title) {
-	webview_set_title((struct webview *)w, title);
-}
-
-static inline void CgoWebViewSetFullscreen(void *w, int fullscreen) {
-	webview_set_fullscreen((struct webview *)w, fullscreen);
-}
-
-static inline void CgoWebViewSetColor(void *w, uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
-	webview_set_color((struct webview *)w, r, g, b, a);
-}
-
-static inline void CgoDialog(void *w, int dlgtype, int flags,
-		char *title, char *arg, char *res, size_t ressz) {
-	webview_dialog(w, dlgtype, flags,
-		(const char*)title, (const char*) arg, res, ressz);
-}
-
-static inline int CgoWebViewEval(void *w, char *js) {
-	return webview_eval((struct webview *)w, js);
-}
-
-static inline void CgoWebViewInjectCSS(void *w, char *css) {
-	webview_inject_css((struct webview *)w, css);
-}
-
-extern void _webviewDispatchGoCallback(void *);
-static inline void _webview_dispatch_cb(struct webview *w, void *arg) {
-	_webviewDispatchGoCallback(arg);
-}
-static inline void CgoWebViewDispatch(void *w, uintptr_t arg) {
-	webview_dispatch((struct webview *)w, _webview_dispatch_cb, (void *)arg);
-}
-*/
-import "C"
-import (
-	"errors"
-	"runtime"
-	"sync"
-	"unsafe"
-)
-
-func init() {
-	// Ensure that main.main is called from the main thread
-	runtime.LockOSThread()
-}
-
-// Open is a simplified API to open a single native window with a full-size webview in
-// it. It can be helpful if you want to communicate with the core app using XHR
-// or WebSockets (as opposed to using JavaScript bindings).
-//
-// Window appearance can be customized using title, width, height and resizable parameters.
-// URL must be provided and can user either a http or https protocol, or be a
-// local file:// URL. On some platforms "data:" URLs are also supported
-// (Linux/MacOS).
-func Open(title, url string, w, h int, resizable bool) error {
-	titleStr := C.CString(title)
-	defer C.free(unsafe.Pointer(titleStr))
-	urlStr := C.CString(url)
-	defer C.free(unsafe.Pointer(urlStr))
-	resize := C.int(0)
-	if resizable {
-		resize = C.int(1)
-	}
-
-	r := C.webview(titleStr, urlStr, C.int(w), C.int(h), resize)
-	if r != 0 {
-		return errors.New("failed to create webview")
-	}
-	return nil
-}
-
-// ExternalInvokeCallbackFunc is a function type that is called every time
-// "window.external.invoke()" is called from JavaScript. Data is the only
-// obligatory string parameter passed into the "invoke(data)" function from
-// JavaScript. To pass more complex data serialized JSON or base64 encoded
-// string can be used.
-type ExternalInvokeCallbackFunc func(w WebView, data string)
-
-// Settings is a set of parameters to customize the initial WebView appearance
-// and behavior. It is passed into the webview.New() constructor.
-type Settings struct {
-	// WebView main window title
-	Title string
-	// URL to open in a webview
-	URL string
-	// Window width in pixels
-	Width int
-	// Window height in pixels
-	Height int
-	// Allows/disallows window resizing
-	Resizable bool
-	// Enable debugging tools (Linux/BSD/MacOS, on Windows use Firebug)
-	Debug bool
-	// A callback that is executed when JavaScript calls "window.external.invoke()"
-	ExternalInvokeCallback ExternalInvokeCallbackFunc
-}
-
-// WebView is an interface that wraps the basic methods for controlling the UI
-// loop, handling multithreading and providing JavaScript bindings.
-type WebView interface {
-	// Run() starts the main UI loop until the user closes the webview window or
-	// Terminate() is called.
-	Run()
-	// Loop() runs a single iteration of the main UI.
-	Loop(blocking bool) bool
-	// SetTitle() changes window title. This method must be called from the main
-	// thread only. See Dispatch() for more details.
-	SetTitle(title string)
-	// SetFullscreen() controls window full-screen mode. This method must be
-	// called from the main thread only. See Dispatch() for more details.
-	SetFullscreen(fullscreen bool)
-	// SetColor() changes window background color. This method must be called from
-	// the main thread only. See Dispatch() for more details.
-	SetColor(r, g, b, a uint8)
-	// Eval() evaluates an arbitrary JS code inside the webview. This method must
-	// be called from the main thread only. See Dispatch() for more details.
-	Eval(js string) error
-	// InjectJS() injects an arbitrary block of CSS code using the JS API. This
-	// method must be called from the main thread only. See Dispatch() for more
-	// details.
-	InjectCSS(css string)
-	// Dialog() opens a system dialog of the given type and title. String
-	// argument can be provided for certain dialogs, such as alert boxes. For
-	// alert boxes argument is a message inside the dialog box.
-	Dialog(dlgType DialogType, flags int, title string, arg string) string
-	// Terminate() breaks the main UI loop. This method must be called from the main thread
-	// only. See Dispatch() for more details.
-	Terminate()
-	// Dispatch() schedules some arbitrary function to be executed on the main UI
-	// thread. This may be helpful if you want to run some JavaScript from
-	// background threads/goroutines, or to terminate the app.
-	Dispatch(func())
-	// Exit() closes the window and cleans up the resources. Use Terminate() to
-	// forcefully break out of the main UI loop.
-	Exit()
-}
-
-// DialogType is an enumeration of all supported system dialog types
-type DialogType int
-
-const (
-	// DialogTypeOpen is a system file open dialog
-	DialogTypeOpen DialogType = iota
-	// DialogTypeSave is a system file save dialog
-	DialogTypeSave
-	// DialogTypeAlert is a system alert dialog (message box)
-	DialogTypeAlert
-)
-
-const (
-	// DialogFlagFile is a normal file picker dialog
-	DialogFlagFile = C.WEBVIEW_DIALOG_FLAG_FILE
-	// DialogFlagDirectory is an open directory dialog
-	DialogFlagDirectory = C.WEBVIEW_DIALOG_FLAG_DIRECTORY
-	// DialogFlagInfo is an info alert dialog
-	DialogFlagInfo = C.WEBVIEW_DIALOG_FLAG_INFO
-	// DialogFlagWarning is a warning alert dialog
-	DialogFlagWarning = C.WEBVIEW_DIALOG_FLAG_WARNING
-	// DialogFlagError is an error dialog
-	DialogFlagError = C.WEBVIEW_DIALOG_FLAG_ERROR
-)
-
-var (
-	m     sync.Mutex
-	index uintptr
-	fns   = map[uintptr]func(){}
-	cbs   = map[WebView]ExternalInvokeCallbackFunc{}
-)
-
-type webview struct {
-	w unsafe.Pointer
-}
-
-var _ WebView = &webview{}
-
-func boolToInt(b bool) int {
-	if b {
-		return 1
-	}
-	return 0
-}
-
-// NewWebview creates and opens a new webview window using the given settings. The
-// returned object implements the WebView interface. This function returns nil
-// if a window can not be created.
-func NewWebview(settings Settings) WebView {
-	if settings.Width == 0 {
-		settings.Width = 640
-	}
-	if settings.Height == 0 {
-		settings.Height = 480
-	}
-	if settings.Title == "" {
-		settings.Title = "WebView"
-	}
-	w := &webview{}
-	w.w = C.CgoWebViewCreate(C.int(settings.Width), C.int(settings.Height),
-		C.CString(settings.Title), C.CString(settings.URL),
-		C.int(boolToInt(settings.Resizable)), C.int(boolToInt(settings.Debug)))
-	m.Lock()
-	if settings.ExternalInvokeCallback != nil {
-		cbs[w] = settings.ExternalInvokeCallback
-	} else {
-		cbs[w] = func(w WebView, data string) {}
-	}
-	m.Unlock()
-	return w
-}
-
-func (w *webview) Loop(blocking bool) bool {
-	block := C.int(0)
-	if blocking {
-		block = 1
-	}
-	return C.CgoWebViewLoop(w.w, block) == 0
-}
-
-func (w *webview) Run() {
-	for w.Loop(true) {
-	}
-}
-
-func (w *webview) Exit() {
-	C.CgoWebViewExit(w.w)
-}
-
-func (w *webview) Dispatch(f func()) {
-	m.Lock()
-	for ; fns[index] != nil; index++ {
-	}
-	fns[index] = f
-	m.Unlock()
-	C.CgoWebViewDispatch(w.w, C.uintptr_t(index))
-}
-
-func (w *webview) SetTitle(title string) {
-	p := C.CString(title)
-	defer C.free(unsafe.Pointer(p))
-	C.CgoWebViewSetTitle(w.w, p)
-}
-
-func (w *webview) SetColor(r, g, b, a uint8) {
-	C.CgoWebViewSetColor(w.w, C.uint8_t(r), C.uint8_t(g), C.uint8_t(b), C.uint8_t(a))
-}
-
-func (w *webview) SetFullscreen(fullscreen bool) {
-	C.CgoWebViewSetFullscreen(w.w, C.int(boolToInt(fullscreen)))
-}
-
-func (w *webview) Dialog(dlgType DialogType, flags int, title string, arg string) string {
-	const maxPath = 4096
-	titlePtr := C.CString(title)
-	defer C.free(unsafe.Pointer(titlePtr))
-	argPtr := C.CString(arg)
-	defer C.free(unsafe.Pointer(argPtr))
-	resultPtr := (*C.char)(C.calloc((C.size_t)(unsafe.Sizeof((*C.char)(nil))), (C.size_t)(maxPath)))
-	defer C.free(unsafe.Pointer(resultPtr))
-	C.CgoDialog(w.w, C.int(dlgType), C.int(flags), titlePtr,
-		argPtr, resultPtr, C.size_t(maxPath))
-	return C.GoString(resultPtr)
-}
-
-func (w *webview) Eval(js string) error {
-	p := C.CString(js)
-	defer C.free(unsafe.Pointer(p))
-	switch C.CgoWebViewEval(w.w, p) {
-	case -1:
-		return errors.New("evaluation failed")
-	}
-	return nil
-}
-
-func (w *webview) InjectCSS(css string) {
-	p := C.CString(css)
-	defer C.free(unsafe.Pointer(p))
-	C.CgoWebViewInjectCSS(w.w, p)
-}
-
-func (w *webview) Terminate() {
-	C.CgoWebViewTerminate(w.w)
-}
-
-//export _webviewDispatchGoCallback
-func _webviewDispatchGoCallback(index unsafe.Pointer) {
-	var f func()
-	m.Lock()
-	f = fns[uintptr(index)]
-	delete(fns, uintptr(index))
-	m.Unlock()
-	f()
-}
-
-//export _webviewExternalInvokeCallback
-func _webviewExternalInvokeCallback(w unsafe.Pointer, data unsafe.Pointer) {
-	m.Lock()
-	var (
-		cb ExternalInvokeCallbackFunc
-		wv WebView
-	)
-	for wv, cb = range cbs {
-		if wv.(*webview).w == w {
-			break
-		}
-	}
-	m.Unlock()
-	cb(wv, C.GoString((*C.char)(data)))
-}