feat: major refactor

feat: test support for Fedora

.eslintignore

@@ -1 +0,0 @@
-runtime/assets/default.html

.eslintrc.js

@@ -1,8 +1,7 @@
-{
+module.exports = {
     "env": {
         "browser": true,
-        "es6": true,
-        "node": true,
+        "es6": true
     },
     "extends": "eslint:recommended",
     "parserOptions": {
@@ -27,4 +26,4 @@
             "always"
         ]
     }
-}
+};

.github/stale.yml

@@ -1,19 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 30
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - onhold
-  - inprogress
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.gitignore

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

.hound.yml

@@ -1,6 +0,0 @@
-jshint:
-  config_file: .jshintrc
-eslint:
-  enabled: true
-  config_file: .eslintrc
-  ignore_file: .eslintignore

.vscode/launch.json

@@ -4,13 +4,6 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-    {
-      "name": "Test cmd package",
-      "type": "go",
-      "request": "launch",
-      "mode": "test",
-      "program": "${workspaceFolder}/cmd/"
-    },
     {
       "name": "Wails Init",
       "type": "go",

CHANGELOG.md

@@ -1,9 +1,3 @@
-
-2019-07-20 **v0.17.6-pre**
-* Significant refactor of runtime 
-* Removed wailsbridge file - now a unified approach taken
-* Fixed React on Windows - Thanks [Florian Didran](https://github.com/fdidron)!
-
 2019-06-18 **v0.16.0**
 * React template FTW! - Thanks [admin_3.exe](https://github.com/bh90210)!
 * Updated contributors

CONTRIBUTORS.md

@@ -6,7 +6,6 @@ Wails is what it is because of the time and effort given by these great people.
 * [Qais Patankar](https://github.com/qaisjp)
 * [Anthony Lee](https://github.com/alee792)
 * [Adrian Lanzafame](https://github.com/lanzafame)
-* [Mattn](https://github.com/mattn)
 * [0xflotus](https://github.com/0xflotus)
 * [Michael D Henderson](https://github.com/mdhender)
 * [fred2104](https://github.com/fishfishfish2104)
@@ -15,7 +14,3 @@ 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)

README.md

@@ -8,10 +8,9 @@
    <a href="http://godoc.org/github.com/wailsapp/wails"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"/></a>
    <a href="https://www.codefactor.io/repository/github/wailsapp/wails"><img src="https://www.codefactor.io/repository/github/wailsapp/wails/badge" alt="CodeFactor" /></a>
    <a href="https://github.com/wailsapp/wails/issues"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="CodeFactor" /></a>
-   <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=shield"/></a>
    <a href="https://houndci.com"><img src="https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg"/></a>
    <a href="https://github.com/avelino/awesome-go" rel="nofollow"><img src="https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg" alt="Awesome"></a>
-   <a href="https://dev.azure.com/leaanthony/Wails/_build/latest?definitionId=1&branchName=master" rel="nofollow"><img src="https://dev.azure.com/leaanthony/Wails/_apis/build/status/wailsapp.wails?branchName=master" alt="Pipelines"></a>
+   <a href="https://dashboard.guardrails.io/default/gh/wailsapp/wails"><img src="https://badges.guardrails.io/wailsapp/wails.svg?token=53657bc22ec360d7673c894fdd70568e918ec581d10d84427ed4de5fe1eeff1a"></a>
 </p>
 
 The traditional method of providing web interfaces to Go programs is via a built-in web server. Wails offers a different approach: it provides the ability to wrap both Go code and a web frontend into a single binary. Tools are provided to make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative!
@@ -47,41 +46,19 @@ Make sure you have the xcode command line tools installed. This can be done by r
 
 ### Linux
 
-#### Debian/Ubuntu
+#### Ubuntu 18.04, Debian 9, Zorin 15
 
-`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
-
-_Debian: 8, 9, 10_
-
-_Ubuntu: 16.04, 18.04, 19.04_
-
-_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_
+`sudo apt install pkg-config build-essential libgtk-3-dev libwebkit2gtk-4.0-dev`
 
 #### Arch Linux
 
 `sudo pacman -S webkit2gtk gtk3`
 
-_Also succesfully test on: Manjaro & ArcoLinux_
+#### Red Hat Based Distros
 
-#### Centos
+`sudo yum install webkit2gtk-devel gtk3-devel`
 
-`sudo yum install webkitgtk3-devel gtk3-devel`
-
-_CentOS 6, 7_
-
-#### Fedora
-
-`sudo yum install webkit2gtk3-devel gtk3-devel`
-
-_Fedora 29, 30_
-
-#### VoidLinux & VoidLinux-musl
-
-`xbps-install gtk+3-devel webkit2gtk-devel`
-
-#### Gentoo
-
-`sudo emerge gtk+:3 webkit-gtk`
+Note: If you have successfully installed these dependencies on a different flavour of Linux, please consider submitting a PR.
 
 ### Windows
 
@@ -145,6 +122,3 @@ This project was mainly coded to the following albums:
   * [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
   * [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
 
-## Licensing
-
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large)

app.go

@@ -2,12 +2,13 @@ package wails
 
 import (
 	"github.com/wailsapp/wails/cmd"
+	"github.com/wailsapp/wails/lib/logger"
+	"github.com/wailsapp/wails/runtime/go/runtime"
+	"github.com/wailsapp/wails/lib/renderer"
 	"github.com/wailsapp/wails/lib/binding"
+	"github.com/wailsapp/wails/lib/ipc"
 	"github.com/wailsapp/wails/lib/event"
 	"github.com/wailsapp/wails/lib/interfaces"
-	"github.com/wailsapp/wails/lib/ipc"
-	"github.com/wailsapp/wails/lib/logger"
-	"github.com/wailsapp/wails/lib/renderer"
 )
 
 // -------------------------------- Compile time Flags ------------------------------
@@ -19,21 +20,21 @@ var BuildMode = cmd.BuildModeProd
 
 // App defines the main application struct
 type App struct {
-	config         *AppConfig                // The Application configuration object
-	cli            *cmd.Cli                  // In debug mode, we have a cli
-	renderer       interfaces.Renderer       // The renderer is what we will render the app to
-	logLevel       string                    // The log level of the app
-	ipc            interfaces.IPCManager     // Handles the IPC calls
-	log            *logger.CustomLogger      // Logger
-	bindingManager interfaces.BindingManager // Handles binding of Go code to renderer
-	eventManager   interfaces.EventManager   // Handles all the events
-	runtime        interfaces.Runtime        // The runtime object for registered structs
+	config         *Config              // The Application configuration object
+	cli            *cmd.Cli             // In debug mode, we have a cli
+	renderer       interfaces.Renderer    // The renderer is what we will render the app to
+	logLevel       string               // The log level of the app
+	ipc            interfaces.IPCManager          // Handles the IPC calls
+	log            *logger.CustomLogger // Logger
+	bindingManager interfaces.BindingManager     // Handles binding of Go code to renderer
+	eventManager   interfaces.EventManager        // Handles all the events
+	runtime        interfaces.Runtime     // The runtime object for registered structs
 }
 
 // CreateApp creates the application window with the given configuration
 // If none given, the defaults are used
-func CreateApp(optionalConfig ...*AppConfig) *App {
-	var userConfig *AppConfig
+func CreateApp(optionalConfig ...*Config) *App {
+	var userConfig *Config
 	if len(optionalConfig) > 0 {
 		userConfig = optionalConfig[0]
 	}
@@ -86,9 +87,9 @@ func (a *App) start() error {
 	// Log starup
 	a.log.Info("Starting")
 
-	// Check if we are to run in bridge mode
+	// Check if we are to run in headless mode
 	if BuildMode == cmd.BuildModeBridge {
-		a.renderer = &renderer.Bridge{}
+		a.renderer = &renderer.Headless{}
 	}
 
 	// Initialise the renderer
@@ -104,7 +105,7 @@ func (a *App) start() error {
 	a.ipc.Start(a.eventManager, a.bindingManager)
 
 	// Create the runtime
-	a.runtime = NewRuntime(a.eventManager, a.renderer)
+	a.runtime = runtime.NewRuntime(a.eventManager, a.renderer)
 
 	// Start binding manager and give it our renderer
 	err = a.bindingManager.Start(a.renderer, a.runtime)

azure-pipelines.yaml

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

azure-pipelines.yml

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

cli.go

@@ -11,9 +11,10 @@ func (app *App) setupCli() *cmd.Cli {
 	result := cmd.NewCli(app.config.Title, "Debug build")
 	result.Version(cmd.Version)
 
-	// Setup cli to handle loglevel
+	// Setup cli to handle loglevel and headless flags
 	result.
 		StringFlag("loglevel", "Sets the log level [debug|info|error|panic|fatal]. Default debug", &app.logLevel).
+		// BoolFlag("headless", "Runs the app in headless mode", &app.headless).
 		Action(app.start)
 
 	// Banner

cmd/github.go

@@ -18,7 +18,7 @@ func NewGitHubHelper() *GitHubHelper {
 }
 
 // GetVersionTags gets the list of tags on the Wails repo
-// It returns a list of sorted tags in descending order
+// It retuns a list of sorted tags in descending order
 func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
 
 	result := []*SemanticVersion{}

cmd/helpers.go

@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/leaanthony/mewn"
+	mewn "github.com/leaanthony/mewn"
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
 )
@@ -249,8 +249,8 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
 	}
 
-	// Install the runtime
-	err = InstallRuntime(caller, projectDir, projectOptions)
+	// Install the bridge library
+	err = InstallBridge(caller, projectDir, projectOptions)
 	if err != nil {
 		return err
 	}
@@ -263,29 +263,22 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	return nil
 }
 
-// InstallRuntime installs the correct runtime for the type of build
-func InstallRuntime(caller string, projectDir string, projectOptions *ProjectOptions) error {
-	if caller == "build" {
-		return InstallProdRuntime(projectDir, projectOptions)
+// InstallBridge installs the relevant bridge javascript library
+func InstallBridge(caller string, projectDir string, projectOptions *ProjectOptions) error {
+	bridgeFile := "wailsbridge.prod.js"
+	if caller == "serve" {
+		bridgeFile = "wailsbridge.js"
 	}
 
-	return InstallBridge(projectDir, projectOptions)
-}
-
-// InstallBridge installs the relevant bridge javascript library
-func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
-	bridgeFileData := mewn.String("../runtime/assets/bridge.js")
-	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
-	return err
-}
-
-// InstallProdRuntime installs the production runtime
-func InstallProdRuntime(projectDir string, projectOptions *ProjectOptions) error {
-	prodInit := mewn.String("../runtime/js/runtime/init.js")
-	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
-	return err
+	// Copy bridge to project
+	bridgeAssets := mewn.Group("../runtime/bridge/")
+	bridgeFileData := bridgeAssets.Bytes(bridgeFile)
+	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js")
+	err := fs.CreateFile(bridgeFileTarget, bridgeFileData)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 // ServeProject attempts to serve up the current project so that it may be connected to

cmd/linux.go

@@ -17,133 +17,122 @@ type LinuxDistribution int
 const (
 	// Unknown is the catch-all distro
 	Unknown LinuxDistribution = iota
-	// Debian distribution
-	Debian
 	// Ubuntu distribution
 	Ubuntu
 	// Arch linux distribution
 	Arch
-	// CentOS linux distribution
-	CentOS
-	// Fedora linux distribution
-	Fedora
+	// RedHat linux distribution
+	RedHat
+	// Debian distribution
+	Debian
 	// Gentoo distribution
 	Gentoo
 	// Zorin distribution
 	Zorin
-	// Parrot distribution
-	Parrot
-	// Linuxmint distribution
-	Linuxmint
-	// VoidLinux distribution
-	VoidLinux
-	// Elementary distribution
-	Elementary
-	// Kali distribution
-	Kali
-	// Neon distribution
-	Neon
-	// Manjaro distribution
-	Manjaro
 )
 
 // DistroInfo contains all the information relating to a linux distribution
 type DistroInfo struct {
-	Distribution LinuxDistribution
-	Name         string
-	ID           string
-	Description  string
-	Release      string
+	Distribution  LinuxDistribution
+	Description   string
+	Release       string
+	Codename      string
+	DistributorID string
+	DiscoveredBy  string
 }
 
 // GetLinuxDistroInfo returns information about the running linux distribution
 func GetLinuxDistroInfo() *DistroInfo {
-	result := &DistroInfo{
-		Distribution: Unknown,
-		ID:           "unknown",
-		Name:         "Unknown",
-	}
-	_, err := os.Stat("/etc/os-release")
-	if !os.IsNotExist(err) {
-		osRelease, _ := ioutil.ReadFile("/etc/os-release")
-		result = parseOsRelease(string(osRelease))
-	}
-	return result
-}
-
-// parseOsRelease parses the given os-release data and returns
-// a DistroInfo struct with the details
-func parseOsRelease(osRelease string) *DistroInfo {
 	result := &DistroInfo{Distribution: Unknown}
+	program := NewProgramHelper()
+	// Does lsb_release exist?
 
-	// Default value
-	osID := "unknown"
-	osNAME := "Unknown"
-	version := ""
-
-	// Split into lines
-	lines := strings.Split(osRelease, "\n")
-	// Iterate lines
-	for _, line := range lines {
-		// Split each line by the equals char
-		splitLine := strings.SplitN(line, "=", 2)
-		// Check we have
-		if len(splitLine) != 2 {
-			continue
+	lsbRelease := program.FindProgram("lsb_release")
+	if lsbRelease != nil {
+		stdout, _, _, err := lsbRelease.Run("-a")
+		if err != nil {
+			return result
 		}
-		switch splitLine[0] {
-		case "ID":
-			osID = strings.Trim(splitLine[1], "\"")
-		case "NAME":
-			osNAME = strings.Trim(splitLine[1], "\"")
-		case "VERSION_ID":
-			version = strings.Trim(splitLine[1], "\"")
+		result.DiscoveredBy = "lsb"
+		for _, line := range strings.Split(stdout, "\n") {
+			if strings.Contains(line, ":") {
+				// Iterate lines a
+				details := strings.Split(line, ":")
+				key := strings.TrimSpace(details[0])
+				value := strings.TrimSpace(details[1])
+				switch key {
+				case "Distributor ID":
+					result.DistributorID = value
+					switch value {
+					case "Ubuntu":
+						result.Distribution = Ubuntu
+					case "Arch", "ManjaroLinux":
+						result.Distribution = Arch
+					case "Debian":
+						result.Distribution = Debian
+					case "Gentoo":
+						result.Distribution = Gentoo
+					case "Zorin":
+						result.Distribution = Zorin
+					case "Fedora":
+						result.Distribution = RedHat
+					}
+				case "Description":
+					result.Description = value
+				case "Release":
+					result.Release = value
+				case "Codename":
+					result.Codename = value
+				}
+			}
+		}
+		// check if /etc/os-release exists
+	} else if _, err := os.Stat("/etc/os-release"); !os.IsNotExist(err) {
+		// Default value
+		osName := "Unknown"
+		version := ""
+		// read /etc/os-release
+		osRelease, _ := ioutil.ReadFile("/etc/os-release")
+		// Split into lines
+		lines := strings.Split(string(osRelease), "\n")
+		// Iterate lines
+		for _, line := range lines {
+			// Split each line by the equals char
+			splitLine := strings.SplitN(line, "=", 2)
+			// Check we have
+			if len(splitLine) != 2 {
+				continue
+			}
+			switch splitLine[0] {
+			case "NAME":
+				osName = strings.Trim(splitLine[1], "\"")
+			case "VERSION_ID":
+				version = strings.Trim(splitLine[1], "\"")
+			}
+
+		}
+		// Check distro name against list of distros
+		result.Release = version
+		result.DiscoveredBy = "os-release"
+		switch osName {
+		case "Fedora":
+			result.Distribution = RedHat
+		case "CentOS":
+			result.Distribution = RedHat
+		case "Arch Linux":
+			result.Distribution = Arch
+		case "Debian GNU/Linux":
+			result.Distribution = Debian
+		case "Gentoo/Linux":
+			result.Distribution = Gentoo
+		default:
+			result.Distribution = Unknown
+			result.DistributorID = osName
 		}
 	}
-	// Check distro name against list of distros
-	switch osID {
-	case "fedora":
-		result.Distribution = Fedora
-	case "centos":
-		result.Distribution = CentOS
-	case "arch":
-		result.Distribution = Arch
-	case "debian":
-		result.Distribution = Debian
-	case "ubuntu":
-		result.Distribution = Ubuntu
-	case "gentoo":
-		result.Distribution = Gentoo
-	case "zorin":
-		result.Distribution = Zorin
-	case "parrot":
-		result.Distribution = Parrot
-	case "linuxmint":
-		result.Distribution = Linuxmint
-	case "void":
-		result.Distribution = VoidLinux
-	case "elementary":
-		result.Distribution = Elementary
-	case "kali":
-		result.Distribution = Kali
-	case "neon":
-		result.Distribution = Neon
-	case "manjaro":
-		result.Distribution = Manjaro
-	default:
-		result.Distribution = Unknown
-	}
-
-	result.Name = osNAME
-	result.ID = osID
-	result.Release = version
-
 	return result
 }
 
-// CheckPkgInstalled is all functions that use local programs to see if a package is installed
-type CheckPkgInstalled func(string) (bool, error)
-
 // EqueryInstalled uses equery to see if a package is installed
 func EqueryInstalled(packageName string) (bool, error) {
 	program := NewProgramHelper()
@@ -177,17 +166,6 @@ func PacmanInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
-// XbpsInstalled uses pacman to see if a package is installed.
-func XbpsInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	xbpsQuery := program.FindProgram("xbps-query")
-	if xbpsQuery == nil {
-		return false, fmt.Errorf("cannot check dependencies: xbps-query not found")
-	}
-	_, _, exitCode, _ := xbpsQuery.Run("-S", packageName)
-	return exitCode == 0, nil
-}
-
 // RpmInstalled uses rpm to see if a package is installed
 func RpmInstalled(packageName string) (bool, error) {
 	program := NewProgramHelper()
@@ -201,18 +179,18 @@ func RpmInstalled(packageName string) (bool, error) {
 
 // RequestSupportForDistribution promts the user to submit a request to support their
 // currently unsupported distribution
-func RequestSupportForDistribution(distroInfo *DistroInfo) error {
+func RequestSupportForDistribution(distroInfo *DistroInfo, libraryName string) error {
 	var logger = NewLogger()
-	defaultError := fmt.Errorf("unable to check libraries on distribution '%s'", distroInfo.Name)
+	defaultError := fmt.Errorf("unable to check libraries on distribution '%s'. Please ensure that the '%s' equivalent is installed", distroInfo.DistributorID, libraryName)
 
-	logger.Yellow("Distribution '%s' is not currently supported, but we would love to!", distroInfo.Name)
-	q := fmt.Sprintf("Would you like to submit a request to support distribution '%s'?", distroInfo.Name)
+	logger.Yellow("Distribution '%s' is not currently supported, but we would love to!", distroInfo.DistributorID)
+	q := fmt.Sprintf("Would you like to submit a request to support distribution '%s'?", distroInfo.DistributorID)
 	result := Prompt(q, "yes")
 	if strings.ToLower(result) != "yes" {
 		return defaultError
 	}
 
-	title := fmt.Sprintf("Support Distribution '%s'", distroInfo.Name)
+	title := fmt.Sprintf("Support Distribution '%s'", distroInfo.DistributorID)
 
 	var str strings.Builder
 
@@ -227,15 +205,16 @@ func RequestSupportForDistribution(distroInfo *DistroInfo) error {
 	str.WriteString(fmt.Sprintf("| Platform      | %s |\n", runtime.GOOS))
 	str.WriteString(fmt.Sprintf("| Arch          | %s |\n", runtime.GOARCH))
 	str.WriteString(fmt.Sprintf("| GO111MODULE   | %s |\n", gomodule))
-	str.WriteString(fmt.Sprintf("| Distribution ID   | %s |\n", distroInfo.ID))
-	str.WriteString(fmt.Sprintf("| Distribution Name   | %s |\n", distroInfo.Name))
+	str.WriteString(fmt.Sprintf("| Distribution ID   | %s |\n", distroInfo.DistributorID))
 	str.WriteString(fmt.Sprintf("| Distribution Version   | %s |\n", distroInfo.Release))
+	str.WriteString(fmt.Sprintf("| Discovered by   | %s |\n", distroInfo.DiscoveredBy))
 
-	body := fmt.Sprintf("**Description**\nDistribution '%s' is currently unsupported.\n\n**Further Information**\n\n%s\n\n*Please add any extra information here, EG: libraries that are needed to make the distribution work, or commands to install them*", distroInfo.ID, str.String())
+	body := fmt.Sprintf("**Description**\nDistribution '%s' is currently unsupported.\n\n**Further Information**\n\n%s\n\n*Please add any extra information here, EG: libraries that are needed to make the distribution work, or commands to install them*", distroInfo.DistributorID, str.String())
 	fullURL := "https://github.com/wailsapp/wails/issues/new?"
 	params := "title=" + title + "&body=" + body
 
 	fmt.Println("Opening browser to file request.")
 	browser.OpenURL(fullURL + url.PathEscape(params))
 	return nil
+
 }

cmd/linux_test.go

@@ -1,26 +0,0 @@
-package cmd
-
-import "testing"
-
-func TestUbuntuDetection(t *testing.T) {
-	osrelease := `
-NAME="Ubuntu"
-VERSION="18.04.2 LTS (Bionic Beaver)"
-ID=ubuntu
-ID_LIKE=debian
-PRETTY_NAME="Ubuntu 18.04.2 LTS"
-VERSION_ID="18.04"
-HOME_URL="https://www.ubuntu.com/"
-SUPPORT_URL="https://help.ubuntu.com/"
-BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
-PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
-VERSION_CODENAME=bionic
-UBUNTU_CODENAME=bionic
-`
-
-	result := parseOsRelease(osrelease)
-	if result.Distribution != Ubuntu {
-		t.Errorf("expected 'Ubuntu' ID but got '%d'", result.Distribution)
-	}
-
-}

cmd/linuxdb.go

@@ -1,91 +0,0 @@
-package cmd
-
-import (
-	"log"
-
-	"github.com/leaanthony/mewn"
-	"gopkg.in/yaml.v3"
-)
-
-// LinuxDB is the database for linux distribution data.
-type LinuxDB struct {
-	Distributions map[string]*Distribution `yaml:"distributions"`
-}
-
-// Distribution holds the os-release ID and a map of releases.
-type Distribution struct {
-	ID       string              `yaml:"id"`
-	Releases map[string]*Release `yaml:"releases"`
-}
-
-// GetRelease attempts to return the specific Release information
-// for the given release name. If there is no specific match, the
-// default release data is returned.
-func (d *Distribution) GetRelease(version string) *Release {
-	result := d.Releases[version]
-	if result == nil {
-		result = d.Releases["default"]
-	}
-	return result
-}
-
-// Release holds the name and version of the release as given by
-// os-release. Programs is a slice of dependant programs required
-// to be present on the local installation for Wails to function.
-// Libraries is a slice of libraries that must be present for Wails
-// applications to compile.
-type Release struct {
-	Name              string          `yaml:"name"`
-	Version           string          `yaml:"version"`
-	GccVersionCommand string          `yaml:"gccversioncommand"`
-	Programs          []*Prerequisite `yaml:"programs"`
-	Libraries         []*Prerequisite `yaml:"libraries"`
-}
-
-// Prerequisite is a simple struct containing a program/library name
-// plus the distribution specific help text indicating how to install
-// it.
-type Prerequisite struct {
-	Name string `yaml:"name"`
-	Help string `yaml:"help,omitempty"`
-}
-
-// Load will load the given filename from disk and attempt to
-// import the data into the LinuxDB.
-func (l *LinuxDB) Load(filename string) error {
-	if fs.FileExists(filename) {
-		data, err := fs.LoadAsBytes(filename)
-		if err != nil {
-			return err
-		}
-		return l.ImportData(data)
-	}
-	return nil
-}
-
-// ImportData will unmarshal the given YAML formatted data
-// into the LinuxDB
-func (l *LinuxDB) ImportData(data []byte) error {
-	return yaml.Unmarshal(data, l)
-}
-
-// GetDistro returns the Distribution information for the
-// given distribution name. If the distribution is not supported,
-// nil is returned.
-func (l *LinuxDB) GetDistro(distro string) *Distribution {
-	return l.Distributions[distro]
-}
-
-// NewLinuxDB creates a new LinuxDB instance from the bundled
-// linuxdb.yaml file.
-func NewLinuxDB() *LinuxDB {
-	data := mewn.Bytes("./linuxdb.yaml")
-	result := LinuxDB{
-		Distributions: make(map[string]*Distribution),
-	}
-	err := result.ImportData(data)
-	if err != nil {
-		log.Fatal(err)
-	}
-	return &result
-}

cmd/linuxdb.yaml

@@ -1,188 +0,0 @@
----
-distributions:
-  debian:
-    id: debian
-    releases:
-      default:
-        name: Debian
-        version: default
-        gccversioncommand: &gccdumpversion -dumpversion
-        programs: &debiandefaultprograms
-          - name: gcc
-            help: Please install with `sudo apt-get install build-essential` and try again
-          - name: pkg-config
-            help: Please install with `sudo apt-get install pkg-config` and try again
-          - name: npm
-            help: Please install with `curl -sL https://deb.nodesource.com/setup_12.x | sudo bash - && sudo apt-get install -y nodejs` and try again
-        libraries: &debiandefaultlibraries
-          - name: libgtk-3-dev
-            help: Please install with `sudo apt-get install libgtk-3-dev` and try again
-          - name: libwebkit2gtk-4.0-dev
-            help: Please install with `sudo apt-get install libwebkit2gtk-4.0-dev` and try again
-  ubuntu:
-    id: ubuntu
-    releases:
-      default:
-        version: default
-        name: Ubuntu
-        gccversioncommand: &gccdumpfullversion -dumpfullversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
-  kali:
-    id: kali
-    releases:
-      default:
-        version: default
-        name: Kali GNU/Linux
-        gccversioncommand: *gccdumpfullversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
-  parrot:
-    id: parrot
-    releases:
-      default:
-        version: default
-        name: Parrot GNU/Linux
-        gccversioncommand: *gccdumpversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
-  zorin:
-    id: zorin
-    releases:
-      default:
-        version: default
-        name: Zorin
-        gccversioncommand: *gccdumpversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
-  linuxmint:
-    id: linuxmint
-    releases:
-      default:
-        version: default
-        name: Linux Mint
-        gccversioncommand: *gccdumpversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
-  elementary:
-    id: elementary
-    releases:
-      default:
-        version: default
-        name: elementary OS
-        gccversioncommand: *gccdumpfullversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
-  neon:
-    id: neon
-    releases:
-      default:
-        version: default
-        name: KDE neon
-        gccversioncommand: *gccdumpfullversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
-  void:
-    id: void
-    releases:
-      default:
-        version: default
-        name: VoidLinux
-        gccversioncommand: *gccdumpversion
-        programs:
-          - name: gcc
-            help: Please install with `xbps-install base-devel` and try again
-          - name: pkg-config
-            help: Please install with `xbps-install pkg-config` and try again
-          - name: npm
-            help: Please install with `xbps-install nodejs` and try again
-        libraries:
-          - name: gtk+3-devel
-            help: Please install with `xbps-install gtk+3-devel` and try again
-          - name: webkit2gtk-devel
-            help: Please install with `xbps-install webkit2gtk-devel` and try again
-  centos:
-    id: centos
-    releases:
-      default:
-        version: default
-        name: CentOS Linux
-        gccversioncommand: *gccdumpversion
-        programs:
-          - name: gcc
-            help: Please install with `sudo yum install gcc-c++ make` and try again
-          - name: pkg-config
-            help: Please install with `sudo yum install pkgconf-pkg-config` and try again
-          - name: npm
-            help: Please install with `sudo yum install epel-release && sudo yum install nodejs` and try again
-        libraries:
-          - name: gtk3-devel
-            help: Please install with `sudo yum install gtk3-devel` and try again
-          - name: webkitgtk3-devel
-            help: Please install with `sudo yum install webkitgtk3-devel` and try again
-  fedora:
-    id: fedora
-    releases:
-      default:
-        version: default
-        name: Fedora
-        gccversioncommand: *gccdumpfullversion
-        programs:
-          - name: gcc
-            help: Please install with `sudo yum install gcc-c++ make` and try again
-          - name: pkg-config
-            help: Please install with `sudo yum install pkgconf-pkg-config` and try again
-          - name: npm
-            help: Please install `sudo yum install nodejs` and try again
-        libraries:
-          - name: gtk3-devel
-            help: Please install with `sudo yum install gtk3-devel` and try again
-          - name: webkit2gtk3-devel
-            help: Please install with `sudo yum install webkit2gtk3-devel` and try again
-  arch:
-    id: arch
-    releases:
-      default:
-        version: default
-        name: Arch Linux
-        gccversioncommand: *gccdumpversion
-        programs: &archdefaultprograms
-          - name: gcc
-            help: Please install with `sudo pacman -S gcc` and try again
-          - name: pkgconf
-            help: Please install with `sudo pacman -S pkgconf` and try again
-          - name: npm
-            help: Please install with `sudo pacman -S npm` and try again
-        libraries: &archdefaultlibraries
-          - name: gtk3
-            help: Please install with `sudo pacman -S gtk3` and try again
-          - name: webkit2gtk
-            help: Please install with `sudo pacman -S webkit2gtk` and try again
-  manjaro:
-    id: manjaro
-    releases:
-      default:
-        version: default
-        name: Manjaro Linux
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries
-  gentoo:
-    id: gentoo
-    releases:
-      default:
-        version: default
-        name: Gentoo
-        gccversioncommand: *gccdumpversion
-        programs:
-          - name: gcc
-            help: Please install using your system's package manager
-          - name: pkg-config
-            help: Please install using your system's package manager
-          - name: npm
-            help: Please install using your system's package manager
-        libraries:
-          - name: gtk+:3
-            help: Please install with `sudo emerge gtk+:3` and try again
-          - name: webkit-gtk
-            help: Please install with `sudo emerge webkit-gtk` and try again