From a0b06c4700743414241acfa0e5aa45d67b7f35d9 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 25 Jul 2022 21:47:45 +1000 Subject: [PATCH] Bugfix/devwatcher error (#1650) * Fix error logging * Fix building frontend on initial run of wails dev --- v2/cmd/wails/internal/commands/dev/dev.go | 3 ++- .../internal/commands/initialise/templates/base/main.tmpl.go | 2 +- .../initialise/templates/templates/lit-ts/main.tmpl.go | 2 +- .../commands/initialise/templates/templates/lit/main.tmpl.go | 2 +- .../commands/initialise/templates/templates/plain/main.tmpl.go | 2 +- .../initialise/templates/templates/preact-ts/main.tmpl.go | 2 +- .../initialise/templates/templates/preact/main.tmpl.go | 2 +- .../initialise/templates/templates/react-ts/main.tmpl.go | 2 +- .../commands/initialise/templates/templates/react/main.tmpl.go | 2 +- .../initialise/templates/templates/svelte-ts/main.tmpl.go | 2 +- .../initialise/templates/templates/svelte/main.tmpl.go | 2 +- .../initialise/templates/templates/vanilla-ts/main.tmpl.go | 2 +- .../initialise/templates/templates/vanilla/main.tmpl.go | 2 +- .../initialise/templates/templates/vue-ts/main.tmpl.go | 2 +- .../commands/initialise/templates/templates/vue/main.tmpl.go | 2 +- 15 files changed, 16 insertions(+), 15 deletions(-) diff --git a/v2/cmd/wails/internal/commands/dev/dev.go b/v2/cmd/wails/internal/commands/dev/dev.go index a54a79227..24eb8a24e 100644 --- a/v2/cmd/wails/internal/commands/dev/dev.go +++ b/v2/cmd/wails/internal/commands/dev/dev.go @@ -360,7 +360,7 @@ func generateBuildOptions(flags devFlags) *build.Options { LDFlags: flags.ldflags, Compiler: flags.compilerCommand, ForceBuild: flags.forceBuild, - IgnoreFrontend: flags.skipFrontend || flags.frontendDevServerURL != "", + IgnoreFrontend: flags.skipFrontend, Verbosity: flags.verbosity, WailsJSDir: flags.wailsjsdir, RaceDetector: flags.raceDetector, @@ -677,6 +677,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc rebuild = false LogGreen("[Rebuild triggered] files updated") // Try and build the app + buildOptions.IgnoreFrontend = flags.skipFrontend || flags.frontendDevServerURL != "" newBinaryProcess, _, err := restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel) if err != nil { LogRed("Error during build: %s", err.Error()) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/main.tmpl.go index 6d42d2205..96038b923 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go index feeeaa186..90d993f90 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go @@ -28,6 +28,6 @@ func main() { }) if err != nil { - println("Error:", err) + println("Error:", err.Error()) } }