From 5bd22ba85f614e0d5cc11f5eecfa4b8227d6b524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Wed, 19 Jul 2023 12:20:13 +0200
Subject: [PATCH] commands: Delay server builds after the watcher is set up

See #11264
---
 commands/server.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/commands/server.go b/commands/server.go
index 7e6ec5b13ee..bf82b748de9 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -470,14 +470,6 @@ func (c *serverCommand) Name() string {
 }
 
 func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, args []string) error {
-	err := func() error {
-		defer c.r.timeTrack(time.Now(), "Built")
-		err := c.build()
-		return err
-	}()
-	if err != nil {
-		return err
-	}
 
 	// Watch runs its own server as part of the routine
 	if c.serverWatch {
@@ -501,6 +493,15 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 
 	}
 
+	err := func() error {
+		defer c.r.timeTrack(time.Now(), "Built")
+		err := c.build()
+		return err
+	}()
+	if err != nil {
+		return err
+	}
+
 	return c.serve()
 }