From 7f733d787f965f934a53f18ffdf51b1f30cffdef Mon Sep 17 00:00:00 2001
From: stffabi <stffabi@users.noreply.github.com>
Date: Thu, 13 Oct 2022 22:52:52 +0200
Subject: [PATCH] [dev] Do not try to infer assetdir from fs.FS when a frontend
 dev server is in use (#1972)

---
 v2/internal/app/app_dev.go | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/v2/internal/app/app_dev.go b/v2/internal/app/app_dev.go
index 7eb58249..d807ed9a 100644
--- a/v2/internal/app/app_dev.go
+++ b/v2/internal/app/app_dev.go
@@ -90,14 +90,6 @@ func CreateApp(appoptions *options.App) (*App, error) {
 		}
 	}
 
-	if assetdir == "" {
-		// If no assetdir has been defined, let's try to infer it from the project root and the asset FS.
-		assetdir, err = tryInferAssetDirFromFS(appoptions.Assets)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	if frontendDevServerURL != "" {
 		if devServer == "" {
 			return nil, fmt.Errorf("Unable to use FrontendDevServerUrl without a DevServer address")
@@ -112,17 +104,27 @@ func CreateApp(appoptions *options.App) (*App, error) {
 		ctx = context.WithValue(ctx, "frontenddevserverurl", frontendDevServerURL)
 
 		myLogger.Info("Serving assets from frontend DevServer URL: %s", frontendDevServerURL)
-	} else if assetdir != "" {
-		// Let's override the assets to serve from on disk, if needed
-		absdir, err := filepath.Abs(assetdir)
-		if err != nil {
-			return nil, err
+	} else {
+		if assetdir == "" {
+			// If no assetdir has been defined, let's try to infer it from the project root and the asset FS.
+			assetdir, err = tryInferAssetDirFromFS(appoptions.Assets)
+			if err != nil {
+				return nil, err
+			}
 		}
 
-		myLogger.Info("Serving assets from disk: %s", absdir)
-		appoptions.Assets = os.DirFS(absdir)
+		if assetdir != "" {
+			// Let's override the assets to serve from on disk, if needed
+			absdir, err := filepath.Abs(assetdir)
+			if err != nil {
+				return nil, err
+			}
 
-		ctx = context.WithValue(ctx, "assetdir", assetdir)
+			myLogger.Info("Serving assets from disk: %s", absdir)
+			appoptions.Assets = os.DirFS(absdir)
+
+			ctx = context.WithValue(ctx, "assetdir", assetdir)
+		}
 	}
 
 	if devServer != "" {