From d28a7e898754674cc95e76fb33c80f077ae28648 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 6 Oct 2021 20:35:21 +1100 Subject: [PATCH] [v2] Run `go mod tidy` first to ensure deps are up to date --- v2/cmd/wails/internal/commands/dev/dev.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/v2/cmd/wails/internal/commands/dev/dev.go b/v2/cmd/wails/internal/commands/dev/dev.go index c6289338d..36fa29b82 100644 --- a/v2/cmd/wails/internal/commands/dev/dev.go +++ b/v2/cmd/wails/internal/commands/dev/dev.go @@ -107,9 +107,13 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { return err } - // Generate wailsjs module - LogGreen("Generating wailsjs module...") - _, _, err = shell.RunCommand(cwd, "wails", "generate", "module") + // Run go mod tidy to ensure we're up to date + err = runCommand(cwd, "go", "mod", "tidy") + if err != nil { + return err + } + + err = runCommand(cwd, "wails", "generate", "module") if err != nil { return err } @@ -191,6 +195,15 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { return nil } +func runCommand(cwd string, command string, args ...string) error { + LogGreen("Executing: " + command + " " + strings.Join(args, " ")) + _, _, err := shell.RunCommand(cwd, command, args...) + if err != nil { + return err + } + return nil +} + // defaultDevFlags generates devFlags with default options func defaultDevFlags() devFlags { return devFlags{