From 833b6bdbb8beb3e6cd466a1aad2b16e10a6378d4 Mon Sep 17 00:00:00 2001
From: stffabi <stffabi@users.noreply.github.com>
Date: Mon, 8 Aug 2022 09:25:36 +0200
Subject: [PATCH] Merge pull request #1711
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [v2, dev] Improve error message for auto dev server discovery without…
---
 v2/cmd/wails/internal/commands/dev/dev.go | 5 ++++-
 v2/internal/project/project.go            | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/v2/cmd/wails/internal/commands/dev/dev.go b/v2/cmd/wails/internal/commands/dev/dev.go
index 0095273ed..e96c24092 100644
--- a/v2/cmd/wails/internal/commands/dev/dev.go
+++ b/v2/cmd/wails/internal/commands/dev/dev.go
@@ -198,8 +198,9 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		// frontend:dev:watcher command.
+		frontendDevAutoDiscovery := projectConfig.IsFrontendDevServerURLAutoDiscovery()
 		if command := projectConfig.DevWatcherCommand; command != "" {
-			closer, devServerURL, err := runFrontendDevWatcherCommand(cwd, command, projectConfig.FrontendDevServerURL == "auto")
+			closer, devServerURL, err := runFrontendDevWatcherCommand(cwd, command, frontendDevAutoDiscovery)
 			if err != nil {
 				return err
 			}
@@ -208,6 +209,8 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 				flags.frontendDevServerURL = devServerURL
 			}
 			defer closer()
+		} else if frontendDevAutoDiscovery {
+			return fmt.Errorf("Unable to auto discover frontend:dev:serverUrl without a frontend:dev:watcher command, please either set frontend:dev:watcher or remove the auto discovery from frontend:dev:serverUrl")
 		}
 
 		// Do initial build but only for the application.
diff --git a/v2/internal/project/project.go b/v2/internal/project/project.go
index 136abd8a5..0deab17f3 100644
--- a/v2/internal/project/project.go
+++ b/v2/internal/project/project.go
@@ -103,6 +103,10 @@ func (p *Project) GetDevInstallerCommand() string {
 	return p.InstallCommand
 }
 
+func (p *Project) IsFrontendDevServerURLAutoDiscovery() bool {
+	return p.FrontendDevServerURL == "auto"
+}
+
 func (p *Project) Save() error {
 	data, err := json.MarshalIndent(p, "", "  ")
 	if err != nil {