Update module path

v2/cmd/wails/internal/commands/build/build.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/leaanthony/clir"
 	"github.com/leaanthony/slicer"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/pkg/commands/build"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
 // AddBuildSubcommand adds the `build` command for the Wails application

v2/cmd/wails/internal/commands/dev/dev.go

@@ -0,0 +1,261 @@
+package dev
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"runtime"
+	"strings"
+	"syscall"
+	"time"
+
+	"github.com/fsnotify/fsnotify"
+	"github.com/leaanthony/clir"
+	"github.com/leaanthony/slicer"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/process"
+	"github.com/wailsapp/wails/v2/pkg/commands/build"
+)
+
+// AddSubcommand adds the `dev` command for the Wails application
+func AddSubcommand(app *clir.Cli) error {
+
+	command := app.NewSubCommand("dev", "Development mode")
+
+	outputType := "desktop"
+
+	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
+
+	// Setup target type flag
+	description := "Type of application to develop. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
+	// Passthrough ldflags
+	ldflags := ""
+	command.StringFlag("ldflags", "optional ldflags", &ldflags)
+
+	// compiler command
+	compilerCommand := "go"
+	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
+
+	// extensions to trigger rebuilds
+	extensions := "go"
+	command.StringFlag("m", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
+
+	command.Action(func() error {
+
+		// Validate inputs
+		if !validTargetTypes.Contains(outputType) {
+			return fmt.Errorf("output type '%s' is not valid", outputType)
+		}
+
+		// Create logger
+		logger := logger.New()
+		logger.AddOutput(os.Stdout)
+		app.PrintBanner()
+
+		// TODO: Check you are in a project directory
+
+		watcher, err := fsnotify.NewWatcher()
+		if err != nil {
+			return err
+		}
+		defer watcher.Close()
+
+		var debugBinaryProcess *process.Process = nil
+		var buildFrontend bool = true
+		var extensionsThatTriggerARebuild = strings.Split(extensions, ",")
+
+		// Setup signal handler
+		quitChannel := make(chan os.Signal, 1)
+		signal.Notify(quitChannel, os.Interrupt, os.Kill, syscall.SIGTERM)
+
+		debounceQuit := make(chan bool, 1)
+
+		// Do initial build
+		logger.Info("Building application for development...")
+		debugBinaryProcess = restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
+
+		go debounce(100*time.Millisecond, watcher.Events, debounceQuit, func(event fsnotify.Event) {
+			// logger.Info("event: %+v", event)
+
+			// Check for new directories
+			if event.Op&fsnotify.Create == fsnotify.Create {
+				// If this is a folder, add it to our watch list
+				if fs.DirExists(event.Name) {
+					if !strings.Contains(event.Name, "node_modules") {
+						watcher.Add(event.Name)
+						logger.Info("Watching directory: %s", event.Name)
+					}
+				}
+				return
+			}
+
+			// Check for file writes
+			if event.Op&fsnotify.Write == fsnotify.Write {
+
+				// logger.Info("modified file: %s", event.Name)
+				var rebuild bool = false
+
+				// Iterate all file patterns
+				for _, pattern := range extensionsThatTriggerARebuild {
+					rebuild = strings.HasSuffix(event.Name, pattern)
+					if err != nil {
+						logger.Fatal(err.Error())
+					}
+					if rebuild {
+						// Only build frontend when the file isn't a Go file
+						buildFrontend = !strings.HasSuffix(event.Name, "go")
+						break
+					}
+				}
+
+				if !rebuild {
+					logger.Info("Filename change: %s did not match extension list %s", event.Name, extensions)
+					return
+				}
+
+				if buildFrontend {
+					logger.Info("Full rebuild triggered: %s updated", event.Name)
+				} else {
+					logger.Info("Partial build triggered: %s updated", event.Name)
+				}
+
+				// Do a rebuild
+
+				// Try and build the app
+				newBinaryProcess := restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
+
+				// If we have a new process, save it
+				if newBinaryProcess != nil {
+					debugBinaryProcess = newBinaryProcess
+				}
+
+			}
+		})
+
+		// Get project dir
+		dir, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		// Get all subdirectories
+		dirs, err := fs.GetSubdirectories(dir)
+		if err != nil {
+			return err
+		}
+
+		// Setup a watcher for non-node_modules directories
+		dirs.Each(func(dir string) {
+			if strings.Contains(dir, "node_modules") {
+				return
+			}
+			logger.Info("Watching directory: %s", dir)
+			err = watcher.Add(dir)
+			if err != nil {
+				logger.Fatal(err.Error())
+			}
+		})
+
+		// Wait until we get a quit signal
+		quit := false
+		for quit == false {
+			select {
+			case <-quitChannel:
+				println()
+				// Notify debouncer to quit
+				debounceQuit <- true
+				quit = true
+			}
+		}
+
+		// Kill the current program if running
+		if debugBinaryProcess != nil {
+			debugBinaryProcess.Kill()
+		}
+
+		logger.Info("Development mode exited")
+
+		return nil
+	})
+
+	return nil
+}
+
+// Credit: https://drailing.net/2018/01/debounce-function-for-golang/
+func debounce(interval time.Duration, input chan fsnotify.Event, quitChannel chan bool, cb func(arg fsnotify.Event)) {
+	var item fsnotify.Event
+	timer := time.NewTimer(interval)
+exit:
+	for {
+		select {
+		case item = <-input:
+			timer.Reset(interval)
+		case <-timer.C:
+			if item.Name != "" {
+				cb(item)
+			}
+		case <-quitChannel:
+			break exit
+		}
+	}
+}
+
+func restartApp(logger *logger.Logger, outputType string, ldflags string, compilerCommand string, buildFrontend bool, debugBinaryProcess *process.Process) *process.Process {
+
+	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand, buildFrontend)
+	println()
+	if err != nil {
+		logger.Error("Build Failed: %s", err.Error())
+		return nil
+	}
+	logger.Info("Build new binary: %s", appBinary)
+
+	// Kill existing binary if need be
+	if debugBinaryProcess != nil {
+		killError := debugBinaryProcess.Kill()
+
+		if killError != nil {
+			logger.Fatal("Unable to kill debug binary (PID: %d)!", debugBinaryProcess.PID())
+		}
+
+		debugBinaryProcess = nil
+	}
+
+	// TODO: Generate `backend.js`
+
+	// Start up new binary
+	newProcess := process.NewProcess(logger, appBinary)
+	err = newProcess.Start()
+	if err != nil {
+		// Remove binary
+		fs.DeleteFile(appBinary)
+		logger.Fatal("Unable to start application: %s", err.Error())
+	}
+
+	return newProcess
+}
+
+func buildApp(logger *logger.Logger, outputType string, ldflags string, compilerCommand string, buildFrontend bool) (string, error) {
+
+	// Create random output file
+	outputFile := fmt.Sprintf("debug-%d", time.Now().Unix())
+
+	// Create BuildOptions
+	buildOptions := &build.Options{
+		Logger:         logger,
+		OutputType:     outputType,
+		Mode:           build.Debug,
+		Pack:           false,
+		Platform:       runtime.GOOS,
+		LDFlags:        ldflags,
+		Compiler:       compilerCommand,
+		OutputFile:     outputFile,
+		IgnoreFrontend: !buildFrontend,
+	}
+
+	return build.Build(buildOptions)
+
+}

v2/cmd/wails/internal/commands/doctor/doctor.go

@@ -8,9 +8,9 @@ import (
 	"text/tabwriter"
 
 	"github.com/leaanthony/clir"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/system"
-	"github.com/leaanthony/wailsv2/v2/internal/system/packagemanager"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/system"
+	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
 )
 
 // AddSubcommand adds the `doctor` command for the Wails application

v2/cmd/wails/internal/commands/initialise/initialise.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/leaanthony/clir"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/templates"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/templates"
 )
 
 // AddSubcommand adds the `init` command for the Wails application

v2/cmd/wails/main.go

@@ -4,9 +4,9 @@ import (
 	"os"
 
 	"github.com/leaanthony/clir"
-	"github.com/leaanthony/wailsv2/v2/cmd/wails/internal/commands/build"
-	"github.com/leaanthony/wailsv2/v2/cmd/wails/internal/commands/doctor"
-	"github.com/leaanthony/wailsv2/v2/cmd/wails/internal/commands/initialise"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/build"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/doctor"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise"
 )
 
 func fatal(message string) {

v2/go.mod

@@ -1,4 +1,4 @@
-module github.com/leaanthony/wailsv2/v2
+module github.com/wailsapp/wails/v2
 
 go 1.13
 

v2/internal/app/default.go

@@ -10,7 +10,7 @@ package app
 import (
 	"os"
 
-	"github.com/leaanthony/wailsv2/v2/internal/features"
+	"github.com/wailsapp/wails/v2/internal/features"
 )
 
 // App defines a Wails application structure

v2/internal/app/desktop.go

@@ -5,14 +5,14 @@ package app
 import (
 	"os"
 
-	"github.com/leaanthony/wailsv2/v2/internal/binding"
-	"github.com/leaanthony/wailsv2/v2/internal/features"
-	"github.com/leaanthony/wailsv2/v2/internal/ffenestri"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
-	"github.com/leaanthony/wailsv2/v2/internal/signal"
-	"github.com/leaanthony/wailsv2/v2/internal/subsystem"
+	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/features"
+	"github.com/wailsapp/wails/v2/internal/ffenestri"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/signal"
+	"github.com/wailsapp/wails/v2/internal/subsystem"
 )
 
 // App defines a Wails application structure

v2/internal/app/hybrid.go

@@ -7,14 +7,14 @@ import (
 	"path/filepath"
 
 	"github.com/leaanthony/clir"
-	"github.com/leaanthony/wailsv2/v2/internal/binding"
-	"github.com/leaanthony/wailsv2/v2/internal/features"
-	"github.com/leaanthony/wailsv2/v2/internal/ffenestri"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
-	"github.com/leaanthony/wailsv2/v2/internal/subsystem"
-	"github.com/leaanthony/wailsv2/v2/internal/webserver"
+	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/features"
+	"github.com/wailsapp/wails/v2/internal/ffenestri"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/subsystem"
+	"github.com/wailsapp/wails/v2/internal/webserver"
 )
 
 // Config defines the Application's configuration

v2/internal/app/server.go

@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 
 	"github.com/leaanthony/clir"
-	"github.com/leaanthony/wailsv2/v2/internal/binding"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
-	"github.com/leaanthony/wailsv2/v2/internal/subsystem"
-	"github.com/leaanthony/wailsv2/v2/internal/webserver"
+	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/subsystem"
+	"github.com/wailsapp/wails/v2/internal/webserver"
 )
 
 // App defines a Wails application structure

v2/internal/assetdb/assetdb.go

@@ -67,7 +67,7 @@ func (a *AssetDB) Serialize(name, pkg string) string {
 	header := `// DO NOT EDIT - Generated automatically
 package %s
 
-import "github.com/leaanthony/wailsv2/v2/internal/assetdb"
+import "github.com/wailsapp/wails/v2/internal/assetdb"
 
 var (
 	%s *assetdb.AssetDB = assetdb.NewAssetDB()

v2/internal/binding/binding.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 type Bindings struct {

v2/internal/ffenestri/features_linux.go

@@ -13,7 +13,7 @@ package ffenestri
 
 */
 import "C"
-import "github.com/leaanthony/wailsv2/v2/internal/features"
+import "github.com/wailsapp/wails/v2/internal/features"
 
 func (a *Application) processOSFeatureFlags(features *features.Features) {
 

v2/internal/ffenestri/ffenestri.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/leaanthony/wailsv2/v2/internal/features"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher"
+	"github.com/wailsapp/wails/v2/internal/features"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
 )
 
 /*

v2/internal/ffenestri/ffenestri_client.go

@@ -15,7 +15,7 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 // Client is our implentation of messageDispatcher.Client

v2/internal/html/assetbundle.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/leaanthony/slicer"
-	"github.com/leaanthony/wailsv2/v2/internal/assetdb"
+	"github.com/wailsapp/wails/v2/internal/assetdb"
 	"golang.org/x/net/html"
 )
 

v2/internal/messagedispatcher/dispatchclient.go

@@ -3,9 +3,9 @@ package messagedispatcher
 import (
 	"fmt"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher/message"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 type Client interface {

v2/internal/messagedispatcher/messagedispatcher.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/leaanthony/wailsv2/v2/internal/crypto"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher/message"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/crypto"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Dispatcher translates messages received from the frontend

v2/internal/parse/parse.go

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

v2/internal/process/process.go

@@ -0,0 +1,63 @@
+package process
+
+import (
+	"os/exec"
+
+	"github.com/wailsapp/wails/v2/internal/logger"
+)
+
+// Process defines a process that can be executed
+type Process struct {
+	logger      *logger.Logger
+	cmd         *exec.Cmd
+	exitChannel chan bool
+	Running     bool
+}
+
+// NewProcess creates a new process struct
+func NewProcess(logger *logger.Logger, cmd string, args ...string) *Process {
+	return &Process{
+		logger:      logger,
+		cmd:         exec.Command(cmd, args...),
+		exitChannel: make(chan bool, 1),
+	}
+}
+
+// Start the process
+func (p *Process) Start() error {
+
+	err := p.cmd.Start()
+	if err != nil {
+		return err
+	}
+
+	p.Running = true
+
+	go func(cmd *exec.Cmd, running *bool, logger *logger.Logger, exitChannel chan bool) {
+		logger.Info("Starting process (PID: %d)", cmd.Process.Pid)
+		cmd.Wait()
+		logger.Info("Exiting process (PID: %d)", cmd.Process.Pid)
+		*running = false
+		exitChannel <- true
+	}(p.cmd, &p.Running, p.logger, p.exitChannel)
+
+	return nil
+}
+
+// Kill the process
+func (p *Process) Kill() error {
+	if !p.Running {
+		return nil
+	}
+	err := p.cmd.Process.Kill()
+
+	// Wait for command to exit properly
+	<-p.exitChannel
+
+	return err
+}
+
+// PID returns the process PID
+func (p *Process) PID() int {
+	return p.cmd.Process.Pid
+}

v2/internal/runtime/goruntime/browser_test.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 func TestBrowserOpen(t *testing.T) {

v2/internal/runtime/goruntime/dialog.go

@@ -3,8 +3,8 @@ package goruntime
 import (
 	"fmt"
 
-	"github.com/leaanthony/wailsv2/v2/internal/crypto"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/crypto"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Dialog defines all Dialog related operations

v2/internal/runtime/goruntime/events.go

@@ -1,8 +1,8 @@
 package goruntime
 
 import (
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher/message"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Events defines all events related operations

v2/internal/runtime/goruntime/runtime.go

@@ -1,6 +1,6 @@
 package goruntime
 
-import "github.com/leaanthony/wailsv2/v2/internal/servicebus"
+import "github.com/wailsapp/wails/v2/internal/servicebus"
 
 // Runtime is a means for the user to interact with the application at runtime
 type Runtime struct {

v2/internal/runtime/goruntime/window.go

@@ -1,6 +1,8 @@
 package goruntime
 
-import "github.com/leaanthony/wailsv2/v2/internal/servicebus"
+import (
+	"github.com/wailsapp/wails/v2/internal/servicebus"
+)
 
 // Window defines all Window related operations
 type Window interface {

v2/internal/servicebus/servicebus.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 // ServiceBus is a messaging bus for Wails applications

v2/internal/servicebus/servicebus_test.go

@@ -4,8 +4,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
 	"github.com/matryer/is"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 type Person interface {

v2/internal/signal/signal.go

@@ -5,8 +5,8 @@ import (
 	gosignal "os/signal"
 	"syscall"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Manager manages signals such as CTRL-C

v2/internal/subsystem/binding.go

@@ -1,10 +1,10 @@
 package subsystem
 
 import (
-	"github.com/leaanthony/wailsv2/v2/internal/binding"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/runtime/goruntime"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/runtime/goruntime"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Binding is the Binding subsystem. It manages all service bus messages

v2/internal/subsystem/call.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/leaanthony/wailsv2/v2/internal/binding"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher/message"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Call is the Call subsystem. It manages all service bus messages

v2/internal/subsystem/event.go

@@ -4,9 +4,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher/message"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // eventListener holds a callback function which is invoked when

v2/internal/subsystem/event_test.go

@@ -5,10 +5,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher/message"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
 	"github.com/matryer/is"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher/message"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 func TestSingleTopic(t *testing.T) {

v2/internal/subsystem/log.go

@@ -3,8 +3,8 @@ package subsystem
 import (
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Log is the Logging subsystem. It handles messages with topics starting

v2/internal/subsystem/runtime.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/runtime/goruntime"
-	"github.com/leaanthony/wailsv2/v2/internal/servicebus"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/runtime/goruntime"
+	"github.com/wailsapp/wails/v2/internal/servicebus"
 )
 
 // Runtime is the Runtime subsystem. It handles messages with topics starting

v2/internal/system/packagemanager/apt.go

@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // Apt represents the Apt manager

v2/internal/system/packagemanager/emerge.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // Emerge represents the Emerge package manager

v2/internal/system/packagemanager/eopkg.go

@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // Eopkg represents the Eopkg manager

v2/internal/system/packagemanager/packagemanager.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // PackageManager is a common interface across all package managers

v2/internal/system/packagemanager/pacman.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // Pacman represents the Pacman package manager

v2/internal/system/packagemanager/yum.go

@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // Yum represents the Yum manager

v2/internal/system/packagemanager/zypper.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // Zypper represents the Zypper package manager

v2/internal/system/system.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	"github.com/leaanthony/wailsv2/v2/internal/system/operatingsystem"
-	"github.com/leaanthony/wailsv2/v2/internal/system/packagemanager"
+	"github.com/wailsapp/wails/v2/internal/system/operatingsystem"
+	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
 )
 
 // Info holds information about the current operating system,

v2/internal/system/system_linux.go

@@ -3,8 +3,8 @@
 package system
 
 import (
-	"github.com/leaanthony/wailsv2/v2/internal/system/operatingsystem"
-	"github.com/leaanthony/wailsv2/v2/internal/system/packagemanager"
+	"github.com/wailsapp/wails/v2/internal/system/operatingsystem"
+	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
 )
 
 func (i *Info) discover() error {

v2/internal/templates/templates.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/leaanthony/gosod"
 	"github.com/leaanthony/slicer"
-	"github.com/leaanthony/wailsv2/v2/internal/fs"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
 	"github.com/olekukonko/tablewriter"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 // Cahce for the templates

v2/internal/templates/templates/svelte-mui/basic.tmpl.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/internal/templates/templates/svelte-mui/go.mod.tmpl

@@ -3,7 +3,7 @@ module test
 go 1.13
 
 require (
-	github.com/leaanthony/wailsv2/v2 v2.0.0-alpha
+	github.com/wailsapp/wails/v2 v2.0.0-alpha
 )
 
-replace github.com/leaanthony/wailsv2/v2 v2.0.0-alpha => {{.WailsDirectory}}
+replace github.com/wailsapp/wails/v2 v2.0.0-alpha => {{.WailsDirectory}}

v2/internal/templates/templates/svelte-mui/main.tmpl.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/internal/templates/templates/vanilla/basic.tmpl.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/internal/templates/templates/vanilla/go.mod.tmpl

@@ -3,7 +3,7 @@ module test
 go 1.13
 
 require (
-	github.com/leaanthony/wailsv2/v2 v2.0.0-alpha
+	github.com/wailsapp/wails/v2 v2.0.0-alpha
 )
 
-replace github.com/leaanthony/wailsv2/v2 v2.0.0-alpha => {{.WailsDirectory}}
+replace github.com/wailsapp/wails/v2 v2.0.0-alpha => {{.WailsDirectory}}

v2/internal/templates/templates/vanilla/main.tmpl.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/internal/templates/templates/vuetify2-basic/basic.tmpl.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/internal/templates/templates/vuetify2-basic/go.mod.tmpl

@@ -3,7 +3,7 @@ module test
 go 1.13
 
 require (
-	github.com/leaanthony/wailsv2/v2 v2.0.0-alpha
+	github.com/wailsapp/wails/v2 v2.0.0-alpha
 )
 
-replace github.com/leaanthony/wailsv2/v2 v2.0.0-alpha => {{.WailsDirectory}}
+replace github.com/wailsapp/wails/v2 v2.0.0-alpha => {{.WailsDirectory}}

v2/internal/templates/templates/vuetify2-basic/main.tmpl.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/internal/webserver/webassets.go

@@ -1,6 +1,6 @@
 package webserver
 
-import "github.com/leaanthony/wailsv2/v2/internal/assetdb"
+import "github.com/wailsapp/wails/v2/internal/assetdb"
 
 var (
 	// WebAssets is our single asset db instance.

v2/internal/webserver/webserver.go

@@ -5,11 +5,11 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/leaanthony/wailsv2/v2/internal/assetdb"
-	"github.com/leaanthony/wailsv2/v2/internal/binding"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/messagedispatcher"
-	"github.com/leaanthony/wailsv2/v2/internal/subsystem"
+	"github.com/wailsapp/wails/v2/internal/assetdb"
+	"github.com/wailsapp/wails/v2/internal/binding"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
+	"github.com/wailsapp/wails/v2/internal/subsystem"
 )
 
 // WebServer serves the application over http

v2/internal/webserver/websockets.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/logger"
 	ws "nhooyr.io/websocket"
 	"nhooyr.io/websocket/wsjson"
 )

v2/pkg/commands/build/base.go

@@ -11,12 +11,12 @@ import (
 	"strings"
 
 	"github.com/leaanthony/slicer"
-	"github.com/leaanthony/wailsv2/v2/internal/assetdb"
-	"github.com/leaanthony/wailsv2/v2/internal/fs"
-	"github.com/leaanthony/wailsv2/v2/internal/html"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/project"
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/assetdb"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/html"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/project"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // BaseBuilder is the common builder struct

v2/pkg/commands/build/build.go

@@ -6,8 +6,8 @@ import (
 	"runtime"
 
 	"github.com/leaanthony/slicer"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/project"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/project"
 )
 
 // Mode is the type used to indicate the build modes

v2/pkg/commands/build/builder.go

@@ -1,8 +1,8 @@
 package build
 
 import (
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
-	"github.com/leaanthony/wailsv2/v2/internal/project"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/project"
 )
 
 // Builder defines a builder that can build Wails applications

v2/pkg/commands/build/desktop.go

@@ -5,9 +5,9 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/leaanthony/wailsv2/v2/internal/fs"
-	"github.com/leaanthony/wailsv2/v2/internal/html"
-	"github.com/leaanthony/wailsv2/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/html"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 // DesktopBuilder builds applications for the desktop

v2/pkg/commands/build/hybrid.go

@@ -1,7 +1,7 @@
 package build
 
 import (
-	"github.com/leaanthony/wailsv2/v2/internal/project"
+	"github.com/wailsapp/wails/v2/internal/project"
 )
 
 // HybridBuilder builds applications as a server

v2/pkg/commands/build/packager.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/leaanthony/wailsv2/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/fs"
 )
 
 // PackageProject packages the application

v2/pkg/commands/build/packager_linux.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/leaanthony/slicer"
-	"github.com/leaanthony/wailsv2/v2/internal/fs"
-	"github.com/leaanthony/wailsv2/v2/internal/shell"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 func deleteLinuxPackFiles(appDirBase string) {

v2/pkg/commands/build/server.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/leaanthony/wailsv2/v2/internal/fs"
-	"github.com/leaanthony/wailsv2/v2/internal/html"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/html"
 )
 
 // ServerBuilder builds applications as a server

v2/test/disable-resize/basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/test/disable-resize/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/test/frameless/basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/test/frameless/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/test/hidden/basic.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	wails "github.com/wailsapp/wails/v2"
+)
+
+// Basic application struct
+type Basic struct {
+	runtime *wails.Runtime
+}
+
+// newBasic creates a new Basic application struct
+func newBasic() *Basic {
+	return &Basic{}
+}
+
+// WailsInit is called at application startup
+func (b *Basic) WailsInit(runtime *wails.Runtime) error {
+	// Perform your setup here
+	b.runtime = runtime
+
+	// Show window after 5 seconds
+	time.AfterFunc(5*time.Second, func() { b.runtime.Window.Show() })
+
+	return nil
+}
+
+// WailsShutdown is called at application termination
+func (b *Basic) WailsShutdown() {
+	// Perform your teardown here
+}
+
+// Greet returns a greeting for the given name
+func (b *Basic) Greet(name string) string {
+	return fmt.Sprintf("Hello %s!", name)
+}
+
+// Close shuts down the application
+func (b *Basic) Close() {
+	b.runtime.Quit()
+}

v2/test/hidden/main.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	wails "github.com/wailsapp/wails/v2"
+)
+
+func main() {
+
+	// Create application with options
+	app := wails.CreateAppWithOptions(&wails.Options{
+		Title:       "Hidden Demo",
+		Width:       1024,
+		Height:      768,
+		StartHidden: true,
+		Frameless:   true,
+	})
+
+	app.Bind(newBasic())
+
+	app.Run()
+}

v2/test/minmax/basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // Basic application struct

v2/test/minmax/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 func main() {

v2/test/runtime/calc.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // Calc is a calculator

v2/test/runtime/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 type Echo struct {

v2/test/runtime/runtime.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wails "github.com/leaanthony/wailsv2/v2"
+	wails "github.com/wailsapp/wails/v2"
 )
 
 // RuntimeTest to test the runtimes

v2/wails.go

@@ -1,8 +1,8 @@
 package wails
 
 import (
-	"github.com/leaanthony/wailsv2/v2/internal/app"
-	"github.com/leaanthony/wailsv2/v2/internal/runtime/goruntime"
+	"github.com/wailsapp/wails/v2/internal/app"
+	"github.com/wailsapp/wails/v2/internal/runtime/goruntime"
 )
 
 // Runtime is an alias for the goruntime.Runtime struct