chore: linting fixes

fix: use snap command for linux

README.md

@@ -33,7 +33,7 @@ Wails is currently in Beta. Please make sure you read the [Project Status](https
 
 Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as an installation of Go. The basic requirements are:
 
-- Go 1.11 or above
+- Go 1.12
 - npm
 
 ### MacOS

cmd/fs.go

@@ -110,16 +110,19 @@ func (fs *FSHelper) RemoveFiles(files []string) error {
 	return nil
 }
 
+// Dir holds information about a directory
 type Dir struct {
 	localPath string
 	fullPath  string
 }
 
-func (fs *FSHelper) Dir(dir string) (*Dir, error) {
+// Directory creates a new Dir struct with the given directory path
+func (fs *FSHelper) Directory(dir string) (*Dir, error) {
 	fullPath, err := filepath.Abs(dir)
 	return &Dir{fullPath: fullPath}, err
 }
 
+// LocalDir creates a new Dir struct based on a path relative to the caller
 func (fs *FSHelper) LocalDir(dir string) (*Dir, error) {
 	_, filename, _, _ := runtime.Caller(1)
 	fullPath, err := filepath.Abs(filepath.Join(path.Dir(filename), dir))

cmd/prerequisites.go

@@ -52,7 +52,7 @@ func getRequiredProgramsLinux() *Prerequisites {
 	case Ubuntu:
 		result.Add(newPrerequisite("gcc", "Please install with `sudo apt install build-essentials` and try again"))
 		result.Add(newPrerequisite("pkg-config", "Please install with `sudo apt install pkg-config` and try again"))
-		result.Add(newPrerequisite("npm", "Please install with `sudo apt install npm` and try again"))
+		result.Add(newPrerequisite("npm", "Please install with `sudo snap install node --channel=12/stable --classic` and try again"))
 
 	default:
 		result.Add(newPrerequisite("gcc", "Please install with your system package manager and try again"))

cmd/project.go

@@ -84,8 +84,6 @@ func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {
 	// 	ph.GenerateWindowsResourceConfig(projectOptions)
 	// }
 
-	ph.log.Yellow("Project '%s' generated in directory '%s'!", projectOptions.Name, projectOptions.OutputDirectory)
-	ph.log.Yellow("To compile the project, run 'wails build' in the project directory.")
 	return nil
 }
 

cmd/templates.go

@@ -141,7 +141,7 @@ func (t *TemplateHelper) GetTemplateDetails() (map[string]*TemplateDetails, erro
 func (t *TemplateHelper) GetTemplateFilenames(template *TemplateDetails) (*slicer.StringSlicer, error) {
 
 	// Get the subdirectory details
-	templateDir, err := t.fs.Dir(template.Path)
+	templateDir, err := t.fs.Directory(template.Path)
 	if err != nil {
 		return nil, err
 	}

cmd/templates/vuetify-basic/.jshint

@@ -0,0 +1,3 @@
+{ 
+  "esversion": 6 
+}

cmd/templates/vuetify-basic/frontend/.gitignore

@@ -0,0 +1,21 @@
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*

cmd/templates/vuetify-basic/frontend/babel.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/app'
+  ]
+}

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

@@ -0,0 +1,52 @@
+{
+  "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": {
+    "babel-polyfill": "^6.26.0",
+    "core-js": "^2.6.4",
+    "material-design-icons-iconfont": "^5.0.1",
+    "vue": "^2.5.22",
+    "vuetify": "^1.5.14"
+  },
+  "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/vuetify-basic/frontend/src/App.vue

@@ -0,0 +1,60 @@
+<template>
+  <v-app id="inspire" dark>
+    <v-navigation-drawer v-model="drawer" clipped fixed app>
+      <v-list dense>
+        <v-list-tile>
+          <v-list-tile-action>
+            <v-icon>dashboard</v-icon>
+          </v-list-tile-action>
+          <v-list-tile-content>
+            <v-list-tile-title>Dashboard</v-list-tile-title>
+          </v-list-tile-content>
+        </v-list-tile>
+        <v-list-tile>
+          <v-list-tile-action>
+            <v-icon>settings</v-icon>
+          </v-list-tile-action>
+          <v-list-tile-content>
+            <v-list-tile-title>Settings</v-list-tile-title>
+          </v-list-tile-content>
+        </v-list-tile>
+      </v-list>
+    </v-navigation-drawer>
+    <v-toolbar app fixed clipped-left>
+      <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
+      <v-toolbar-title>Application</v-toolbar-title>
+    </v-toolbar>
+    <v-content>
+      <v-container fluid class="px-0">
+        <v-layout justify-center align-center class="px-0">
+          <hello-world></hello-world>
+        </v-layout>
+      </v-container>
+    </v-content>
+    <v-footer app fixed>
+      <span style="margin-left:1em">&copy; You</span>
+    </v-footer>
+  </v-app>
+</template>
+
+<script>
+import HelloWorld from "./components/HelloWorld.vue";
+
+export default {
+  data: () => ({
+    drawer: false
+  }),
+  components: {
+    HelloWorld
+  },
+  props: {
+    source: String
+  }
+};
+</script>
+
+<style>
+.logo {
+  width: 16em;
+}
+</style>

cmd/templates/vuetify-basic/frontend/src/components/HelloWorld.vue

@@ -0,0 +1,83 @@
+<template>
+  <v-container fluid class="px-0">
+    <v-layout>
+      <v-flex xs12 sm6 offset-sm3>
+        <v-card raised="raised" class="pa-4 ma-4">
+          <v-layout justify-center align-center class="pa-4 ma-4">
+            <v-img :src="require('../assets/images/logo.png')"></v-img>
+          </v-layout>
+          <v-card-actions>
+            <v-layout justify-center align-center class="px-0">
+              <v-btn color="blue" dark @click="getMessage">Press Me</v-btn>
+            </v-layout>
+          </v-card-actions>
+        </v-card>
+      </v-flex>
+    </v-layout>
+    <div class="text-xs-center">
+      <v-dialog v-model="dialog" width="500">
+        <v-card>
+          <v-card-title class="headline" primary-title>Message from Go</v-card-title>
+          <v-card-text>{{message}}</v-card-text>
+          <v-divider></v-divider>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn color="primary" flat @click="dialog = false">Awesome</v-btn>
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
+    </div>
+  </v-container>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      message: " ",
+      raised: true,
+      dialog: false
+    };
+  },
+  methods: {
+    getMessage: function() {
+      var self = this;
+      window.backend.basic().then(result => {
+        self.message = result;
+        self.dialog = true;
+      });
+    }
+  }
+};
+</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/vuetify-basic/frontend/src/main.js

@@ -0,0 +1,20 @@
+import Vue from "vue";
+
+// Setup Vuetify
+import Vuetify from 'vuetify';
+Vue.use(Vuetify);
+import 'vuetify/dist/vuetify.min.css';
+import 'material-design-icons-iconfont';
+
+import App from "./App.vue";
+
+Vue.config.productionTip = false;
+Vue.config.devtools = true;
+
+import Bridge from "./wailsbridge";
+
+Bridge.Start(() => {
+  new Vue({
+    render: h => h(App)
+  }).$mount("#app");
+});

cmd/templates/vuetify-basic/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/vuetify-basic/go.mod.template

@@ -0,0 +1 @@
+module {{.BinaryName}}

cmd/templates/vuetify-basic/main.go.template

@@ -0,0 +1,27 @@
+package main
+
+import (
+  "github.com/leaanthony/mewn"
+  "github.com/wailsapp/wails"
+)
+
+func basic() string {
+  return "Hello World!"
+}
+
+func main() {
+
+  js := mewn.String("./frontend/dist/app.js")
+  css := mewn.String("./frontend/dist/app.css")
+
+  app := wails.CreateApp(&wails.AppConfig{
+    Width:  1024,
+    Height: 768,
+    Title:  "{{.Name}}",
+    JS:     js,
+    CSS:    css,
+    Colour: "#131313",
+  })
+  app.Bind(basic)
+  app.Run()
+}

cmd/templates/vuetify-basic/template.json

@@ -0,0 +1,14 @@
+{
+  "name": "Vuetify Basic",
+  "version": "1.0.0",
+  "shortdescription": "Vuetify + Webpack",
+  "description": "Basic template using Vuetify and bundled using Webpack",
+  "install": "npm install",
+  "build": "npm run build",
+  "author": "lea <lea.anthony@gmail.com>",
+  "created": "2019-05-25 09:39:40.009307 +1000 AEST m=+59.539991073",
+  "frontenddir": "frontend",
+  "serve": "npm run serve",
+  "bridge": "src",
+  "wailsdir": ""
+}

cmd/version.go

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

cmd/wails/2_init.go

@@ -2,7 +2,10 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 
+	"github.com/leaanthony/spinner"
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -50,11 +53,33 @@ Any flags that are required and not given will be prompted for.`
 			}
 		}
 
+		genSpinner := spinner.NewSpinner()
+		genSpinner.SetSpinSpeed(50)
+		genSpinner.Start("Generating project...")
+
 		// Generate the project
 		err = projectHelper.GenerateProject(projectOptions)
 		if err != nil {
-			logger.Error(err.Error())
+			genSpinner.Error()
+			return err
 		}
+		genSpinner.Success()
+
+		// Build the project
+		cwd, _ := os.Getwd()
+		projectDir := filepath.Join(cwd, projectOptions.OutputDirectory)
+		program := cmd.NewProgramHelper()
+		buildSpinner := spinner.NewSpinner()
+		buildSpinner.SetSpinSpeed(50)
+		buildSpinner.Start("Building project (this may take a while)...")
+		err = program.RunCommandArray([]string{"wails", "build"}, projectDir)
+		if err != nil {
+			buildSpinner.Error(err.Error())
+			return err
+		}
+		buildSpinner.Success()
+		logger.Yellow("Project '%s' built in directory '%s'!", projectOptions.Name, projectOptions.OutputDirectory)
+
 		return err
 	})
 }

cmd/wails/9_issue.go

@@ -64,7 +64,7 @@ To help you in this process, we will ask for some information, add Go/Wails deta
 		body = "**Description**\n" + (strings.Split(body, "**Description**")[1])
 		fullURL := "https://github.com/wailsapp/wails/issues/new?"
 		body = strings.Replace(body, "A clear and concise description of what the bug is.", description, -1)
-		body = strings.Replace(body, "Please paste the output of `wails report` here.", str.String(), -1)
+		body = strings.Replace(body, "Please provide your platform, GO version and variables, etc", str.String(), -1)
 		params := "title=" + title + "&body=" + body
 
 		fmt.Println("Opening browser to file issue.")

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/leaanthony/mewn v0.10.6
+	github.com/leaanthony/mewn v0.10.7
 	github.com/leaanthony/slicer v1.3.1
 	github.com/leaanthony/spinner v0.5.0
 	github.com/masterminds/semver v1.4.2

go.sum

@@ -33,8 +33,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 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.6 h1:tL8YYcVXGpJJeWlwjd2su88or8Ul+0cQoJPNcICGMto=
-github.com/leaanthony/mewn v0.10.6/go.mod h1:i3ygCWW96qVQlGa8sjWnTM0IKAijoFvTwATDIZgK4k0=
+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.1 h1:n2iIV2sxvL/3bpnmVY0vBjXf3yYFWcB6CYLVMrzJxRw=
 github.com/leaanthony/slicer v1.3.1/go.mod h1:VMB/HGvr3uR3MRpFWHWAm0w+DHQLzPHYe2pKfpFlQIQ=
 github.com/leaanthony/spinner v0.5.0 h1:HQykt/iTy7fmINEREtRbWrt+8j4MxC8dtvWBxEWM9oA=