diff --git a/v3/README.md b/v3/README.md new file mode 100644 index 000000000..1c1f25fde --- /dev/null +++ b/v3/README.md @@ -0,0 +1,3 @@ +# v3 + +This directory is experimental. It probably won't work for you. There's no support for this directory. Dragons be here. You have been warned! \ No newline at end of file diff --git a/v3/cmd/wails/README.md b/v3/cmd/wails/README.md index 6d005d023..2d9af27d8 100644 --- a/v3/cmd/wails/README.md +++ b/v3/cmd/wails/README.md @@ -74,6 +74,14 @@ NOTE: Whilst the tool will work for 32-bit Windows, it is not supported. Please #### defaults ```bash -wails icon -input myicon.png -sizes "32,64,128" -windowsFilename myicon.ico -macFilename myicon.icns +wails generate defaults ``` -This will generate all the default assets and resources in the current directory. I \ No newline at end of file +This will generate all the default assets and resources in the current directory. + +#### bindings + +```bash +wails generate bindings +``` + +Generates bindings and models for your bound Go methods and structs. \ No newline at end of file diff --git a/v3/cmd/wails/main.go b/v3/cmd/wails/main.go index 635316852..77eaa120d 100644 --- a/v3/cmd/wails/main.go +++ b/v3/cmd/wails/main.go @@ -10,7 +10,7 @@ import ( ) func main() { - app := clir.NewCli("wails", "The Wails CLI", "v3") + app := clir.NewCli("Wails", "The Wails CLI", "v3") app.NewSubCommandFunction("init", "Initialise a new project", commands.Init) task := app.NewSubCommand("task", "Run and list tasks") task.NewSubCommandFunction("run", "Run a task", commands.RunTask) diff --git a/v3/go.mod b/v3/go.mod index 416e36ff2..83a089d76 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -3,7 +3,7 @@ module github.com/wailsapp/wails/v3 go 1.19 require ( - github.com/go-task/task/v3 v3.19.1 + github.com/go-task/task/v3 v3.20.0 github.com/jackmordaunt/icns/v2 v2.2.1 github.com/leaanthony/clir v1.5.0 github.com/leaanthony/winicon v1.0.0 @@ -52,5 +52,3 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect mvdan.cc/sh/v3 v3.6.0 // indirect ) - -replace github.com/go-task/task/v3 v3.19.1 => github.com/wailsapp/task/v3 v3.19.1 diff --git a/v3/go.sum b/v3/go.sum index 90fb6b9b3..51f179243 100644 --- a/v3/go.sum +++ b/v3/go.sum @@ -23,6 +23,8 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/go-task/task/v3 v3.20.0 h1:pTavuhP+AiEpKLzh5I6Lja9Ux7ypYO5QMsEPTbhYEDc= +github.com/go-task/task/v3 v3.20.0/go.mod h1:y7rWakbLR5gFElGgo6rA2dyr6vU/zNIDVfn3S4Of6OI= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo= diff --git a/v3/internal/commands/task.go b/v3/internal/commands/task.go index 82a8bf549..d47395e37 100644 --- a/v3/internal/commands/task.go +++ b/v3/internal/commands/task.go @@ -39,7 +39,10 @@ func ListTasks(options *ListTaskOptions) error { if err := e.Setup(); err != nil { return err } - tasks := e.GetTaskList() + tasks, err := e.GetTaskList() + if err != nil { + return err + } if len(tasks) == 0 { return fmt.Errorf("no tasks found. Ensure there is a `Taskfile.yml` in your project. You can generate a default takfile by running `wails generate defaults`") } @@ -57,7 +60,7 @@ func ListTasks(options *ListTaskOptions) error { thisRow[1] = thisTask.Summary tableData = append(tableData, thisRow) } - err := pterm.DefaultTable.WithHasHeader(true).WithHeaderRowSeparator("-").WithData(tableData).Render() + err = pterm.DefaultTable.WithHasHeader(true).WithHeaderRowSeparator("-").WithData(tableData).Render() if err != nil { return err }