chore: Version Bump

More runtime refactor

.chglog/CHANGELOG.tpl.md

@@ -1,42 +0,0 @@
-{{ if .Versions -}}
-<a name="unreleased"></a>
-## [Unreleased]
-
-{{ if .Unreleased.CommitGroups -}}
-{{ range .Unreleased.CommitGroups -}}
-### {{ .Title }}
-{{ range .Commits -}}
-- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
-{{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
-
-{{ range .Versions }}
-<a name="{{ .Tag.Name }}"></a>
-## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
-{{ range .CommitGroups -}}
-### {{ .Title }}
-{{ range .Commits -}}
-- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
-{{ end }}
-{{ end -}}
-
-{{- if .NoteGroups -}}
-{{ range .NoteGroups -}}
-### {{ .Title }}
-{{ range .Notes }}
-{{ .Body }}
-{{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
-
-{{- if .Versions }}
-[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
-{{ range .Versions -}}
-{{ if .Tag.Previous -}}
-[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
-{{ end -}}
-{{ end -}}
-{{ end -}}

.chglog/config.yml

@@ -1,27 +0,0 @@
-style: github
-template: CHANGELOG.tpl.md
-info:
-  title: CHANGELOG
-  repository_url: https://github.com/wailsapp/wails
-options:
-  commits:
-    # filters:
-    #   Type:
-    #     - feat
-    #     - fix
-    #     - perf
-    #     - refactor
-  commit_groups:
-    # title_maps:
-    #   feat: Features
-    #   fix: Bug Fixes
-    #   perf: Performance Improvements
-    #   refactor: Code Refactoring
-  header:
-    pattern: "^(\\w*)\\:\\s(.*)$"
-    pattern_maps:
-      - Type
-      - Subject
-  notes:
-    keywords:
-      - BREAKING CHANGE

.eslintignore

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

.eslintrc

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

.gitignore

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

.hound.yml

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

CHANGELOG.md

@@ -1,3 +1,9 @@
+
+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

@@ -13,3 +13,5 @@ Wails is what it is because of the time and effort given by these great people.
 * [Mark Stenglein](https://github.com/ocelotsloth)
 * [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)

README.md

@@ -46,7 +46,7 @@ Make sure you have the xcode command line tools installed. This can be done by r
 
 ### Linux
 
-#### Ubuntu 18.04, Debian 9
+#### Ubuntu 18.04, Debian 9, Zorin 15
 
 `sudo apt install pkg-config build-essential libgtk-3-dev libwebkit2gtk-4.0-dev`
 

app.go

@@ -2,6 +2,12 @@ package wails
 
 import (
 	"github.com/wailsapp/wails/cmd"
+	"github.com/wailsapp/wails/lib/binding"
+	"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 ------------------------------
@@ -13,15 +19,15 @@ 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       Renderer        // The renderer is what we will render the app to
-	logLevel       string          // The log level of the app
-	ipc            *ipcManager     // Handles the IPC calls
-	log            *CustomLogger   // Logger
-	bindingManager *bindingManager // Handles binding of Go code to renderer
-	eventManager   *eventManager   // Handles all the events
-	runtime        *Runtime        // The runtime object for registered structs
+	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
 }
 
 // CreateApp creates the application window with the given configuration
@@ -34,14 +40,14 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 
 	result := &App{
 		logLevel:       "info",
-		renderer:       &webViewRenderer{},
-		ipc:            newIPCManager(),
-		bindingManager: newBindingManager(),
-		eventManager:   newEventManager(),
-		log:            newCustomLogger("App"),
+		renderer:       renderer.NewWebView(),
+		ipc:            ipc.NewManager(),
+		bindingManager: binding.NewManager(),
+		eventManager:   event.NewManager(),
+		log:            logger.NewCustomLogger("App"),
 	}
 
-	appconfig, err := newAppConfig(userConfig)
+	appconfig, err := newConfig(userConfig)
 	if err != nil {
 		result.log.Fatalf("Cannot use custom HTML: %s", err.Error())
 	}
@@ -75,14 +81,14 @@ func (a *App) Run() error {
 func (a *App) start() error {
 
 	// Set the log level
-	setLogLevel(a.logLevel)
+	logger.SetLogLevel(a.logLevel)
 
 	// Log starup
 	a.log.Info("Starting")
 
-	// Check if we are to run in headless mode
+	// Check if we are to run in bridge mode
 	if BuildMode == cmd.BuildModeBridge {
-		a.renderer = &Headless{}
+		a.renderer = &renderer.Bridge{}
 	}
 
 	// Initialise the renderer
@@ -92,16 +98,16 @@ func (a *App) start() error {
 	}
 
 	// Start event manager and give it our renderer
-	a.eventManager.start(a.renderer)
+	a.eventManager.Start(a.renderer)
 
 	// Start the IPC Manager and give it the event manager and binding manager
-	a.ipc.start(a.eventManager, a.bindingManager)
+	a.ipc.Start(a.eventManager, a.bindingManager)
 
 	// Create the runtime
-	a.runtime = newRuntime(a.eventManager, a.renderer)
+	a.runtime = NewRuntime(a.eventManager, a.renderer)
 
 	// Start binding manager and give it our renderer
-	err = a.bindingManager.start(a.renderer, a.runtime)
+	err = a.bindingManager.Start(a.renderer, a.runtime)
 	if err != nil {
 		return err
 	}
@@ -113,5 +119,5 @@ func (a *App) start() error {
 // Bind allows the user to bind the given object
 // with the application
 func (a *App) Bind(object interface{}) {
-	a.bindingManager.bind(object)
+	a.bindingManager.Bind(object)
 }

app_config.go

@@ -1,97 +0,0 @@
-package wails
-
-import (
-	"strings"
-
-	"github.com/dchest/htmlmin"
-	"github.com/leaanthony/mewn"
-)
-
-// AppConfig is the configuration structure used when creating a Wails App object
-type AppConfig struct {
-	Width, Height    int
-	Title            string
-	defaultHTML      string
-	HTML             string
-	JS               string
-	CSS              string
-	Colour           string
-	Resizable        bool
-	DisableInspector bool
-	isHTMLFragment   bool
-}
-
-func (a *AppConfig) merge(in *AppConfig) error {
-	if in.CSS != "" {
-		a.CSS = in.CSS
-	}
-	if in.Title != "" {
-		a.Title = in.Title
-	}
-	if in.HTML != "" {
-		minified, err := htmlmin.Minify([]byte(in.HTML), &htmlmin.Options{
-			MinifyScripts: true,
-		})
-		if err != nil {
-			return err
-		}
-		inlineHTML := string(minified)
-		inlineHTML = strings.Replace(inlineHTML, "'", "\\'", -1)
-		inlineHTML = strings.Replace(inlineHTML, "\n", " ", -1)
-		a.HTML = strings.TrimSpace(inlineHTML)
-
-		// Deduce whether this is a full html page or a fragment
-		// The document is determined to be a fragment if an HTML
-		// tag exists and is located before the first div tag
-		HTMLTagIndex := strings.Index(a.HTML, "<html")
-		DivTagIndex := strings.Index(a.HTML, "<div")
-
-		if HTMLTagIndex == -1 {
-			a.isHTMLFragment = true
-		} else {
-			if DivTagIndex < HTMLTagIndex {
-				a.isHTMLFragment = true
-			}
-		}
-	}
-
-	if in.Colour != "" {
-		a.Colour = in.Colour
-	}
-
-	if in.JS != "" {
-		a.JS = in.JS
-	}
-
-	if in.Width != 0 {
-		a.Width = in.Width
-	}
-	if in.Height != 0 {
-		a.Height = in.Height
-	}
-	a.Resizable = in.Resizable
-	a.DisableInspector = in.DisableInspector
-
-	return nil
-}
-
-// Creates the default configuration
-func newAppConfig(userConfig *AppConfig) (*AppConfig, error) {
-	result := &AppConfig{
-		Width:     800,
-		Height:    600,
-		Resizable: true,
-		Title:     "My Wails App",
-		Colour:    "#FFF", // White by default
-		HTML:      mewn.String("./wailsruntimeassets/default/default.html"),
-	}
-
-	if userConfig != nil {
-		err := result.merge(userConfig)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return result, nil
-}

cli.go

@@ -11,10 +11,9 @@ func (app *App) setupCli() *cmd.Cli {
 	result := cmd.NewCli(app.config.Title, "Debug build")
 	result.Version(cmd.Version)
 
-	// Setup cli to handle loglevel and headless flags
+	// Setup cli to handle loglevel
 	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/helpers.go

@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"time"
 
-	mewn "github.com/leaanthony/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 bridge library
-	err = InstallBridge(caller, projectDir, projectOptions)
+	// Install the runtime
+	err = InstallRuntime(caller, projectDir, projectOptions)
 	if err != nil {
 		return err
 	}
@@ -263,22 +263,29 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	return nil
 }
 
-// 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"
+// 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)
 	}
 
-	// Copy bridge to project
-	bridgeAssets := mewn.Group("../wailsruntimeassets/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
+	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", "main.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", "main.js")
+	err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
+	return err
 }
 
 // ServeProject attempts to serve up the current project so that it may be connected to

cmd/linux.go

@@ -25,6 +25,10 @@ const (
 	RedHat
 	// Debian distribution
 	Debian
+	// Gentoo distribution
+	Gentoo
+	// Zorin distribution
+	Zorin
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -66,6 +70,12 @@ func GetLinuxDistroInfo() *DistroInfo {
 						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
@@ -113,6 +123,8 @@ func GetLinuxDistroInfo() *DistroInfo {
 			result.Distribution = Arch
 		case "Debian GNU/Linux":
 			result.Distribution = Debian
+		case "Gentoo/Linux":
+			result.Distribution = Gentoo
 		default:
 			result.Distribution = Unknown
 			result.DistributorID = osName
@@ -121,6 +133,17 @@ func GetLinuxDistroInfo() *DistroInfo {
 	return result
 }
 
+// EqueryInstalled uses equery to see if a package is installed
+func EqueryInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	equery := program.FindProgram("equery")
+	if equery == nil {
+		return false, fmt.Errorf("cannont check dependencies: equery not found")
+	}
+	_, _, exitCode, _ := equery.Run("l", packageName)
+	return exitCode == 0, nil
+}
+
 // DpkgInstalled uses dpkg to see if a package is installed
 func DpkgInstalled(packageName string) (bool, error) {
 	program := NewProgramHelper()

cmd/prerequisites.go

@@ -49,7 +49,7 @@ func getRequiredProgramsLinux() *Prerequisites {
 	result := &Prerequisites{}
 	distroInfo := GetLinuxDistroInfo()
 	switch distroInfo.Distribution {
-	case Ubuntu, Debian:
+	case Ubuntu, Debian, Zorin:
 		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 snap install node --channel=12/stable --classic` and try again"))
@@ -93,9 +93,12 @@ func getRequiredLibrariesLinux() (*Prerequisites, error) {
 	result := &Prerequisites{}
 	distroInfo := GetLinuxDistroInfo()
 	switch distroInfo.Distribution {
-	case Ubuntu:
+	case Ubuntu, Debian, Zorin:
 		result.Add(newPrerequisite("libgtk-3-dev", "Please install with `sudo apt install libgtk-3-dev` and try again"))
 		result.Add(newPrerequisite("libwebkit2gtk-4.0-dev", "Please install with `sudo apt install libwebkit2gtk-4.0-dev` and try again"))
+	case Gentoo:
+		result.Add(newPrerequisite("gtk+:3", "Please install with `sudo emerge gtk+:3` and try again"))
+		result.Add(newPrerequisite("webkit-gtk", "Please install with `sudo emerge webkit-gtk` and try again"))
 	case Arch:
 		result.Add(newPrerequisite("gtk3", "Please install with `sudo pacman -S gtk3` and try again"))
 		result.Add(newPrerequisite("webkit2gtk", "Please install with `sudo pacman -S webkit2gtk` and try again"))

cmd/program.go

@@ -117,14 +117,15 @@ func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
 	}
 	args = args[1:]
 	var stderr string
-	// fmt.Printf("RunCommandArray = %s %+v\n", program, args)
+	var stdout string
 	if len(dir) > 0 {
-		_, stderr, err = p.shell.RunInDirectory(dir[0], program, args...)
+		stdout, stderr, err = p.shell.RunInDirectory(dir[0], program, args...)
 	} else {
-		_, stderr, err = p.shell.Run(program, args...)
+		stdout, stderr, err = p.shell.Run(program, args...)
 	}
 	if err != nil {
 		fmt.Println(stderr)
+		fmt.Println(stdout)
 	}
 	return err
 }

cmd/system.go

@@ -272,7 +272,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()
 		for _, library := range *requiredLibraries {
 			switch distroInfo.Distribution {
-			case Ubuntu, Debian:
+			case Ubuntu, Zorin, Debian:
 				installed, err := DpkgInstalled(library.Name)
 				if err != nil {
 					return false, err
@@ -305,6 +305,17 @@ func CheckDependencies(logger *Logger) (bool, error) {
 				} else {
 					logger.Green("Library '%s' installed.", library.Name)
 				}
+			case Gentoo:
+				installed, err := EqueryInstalled(library.Name)
+				if err != nil {
+					return false, err
+				}
+				if !installed {
+					errors = true
+					logger.Error("Library '%s' not found. %s", library.Name, library.Help)
+				} else {
+					logger.Green("Library '%s' installed.", library.Name)
+				}
 			default:
 				return false, RequestSupportForDistribution(distroInfo, library.Name)
 			}

cmd/templates/angular-template/frontend/package.json.template

@@ -21,6 +21,7 @@
     "@angular/platform-browser": "~8.0.1",
     "@angular/platform-browser-dynamic": "~8.0.1",
     "@angular/router": "~8.0.1",
+    "@wailsapp/runtime": "^1.0.0",
     "ngx-build-plus": "^8.0.3",
     "rxjs": "~6.4.0",
     "tslib": "^1.9.0",

cmd/templates/angular-template/frontend/src/main.ts

@@ -6,13 +6,13 @@ import { environment } from './environments/environment';
 
 import 'zone.js'
 
-import Bridge from './wailsbridge';
+import Wails from '@wailsapp/runtime';
 
 if (environment.production) {
   enableProdMode();
 }
 
-Bridge.Start(() => {
+Wails.Init(() => {
   platformBrowserDynamic().bootstrapModule(AppModule)
     .catch(err => console.error(err));
 });