From 41f9c07c88246b933a9a967c3aba52abc555af80 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Wed, 27 Apr 2022 21:29:54 +1000
Subject: [PATCH] Fixes #1343

---
 v2/internal/appng/app_dev.go   | 4 ++++
 v2/pkg/commands/build/base.go  | 7 ++++++-
 v2/pkg/commands/build/build.go | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/v2/internal/appng/app_dev.go b/v2/internal/appng/app_dev.go
index eb7153e2..71715635 100644
--- a/v2/internal/appng/app_dev.go
+++ b/v2/internal/appng/app_dev.go
@@ -220,6 +220,10 @@ func generateBindings(bindings *binding.Bindings) error {
 		return err
 	}
 
+	if projectConfig.WailsJSDir == "" {
+		projectConfig.WailsJSDir = filepath.Join(cwd, "frontend")
+	}
+
 	targetDir := filepath.Join(projectConfig.WailsJSDir, "wailsjs", "go")
 	err = os.RemoveAll(targetDir)
 	if err != nil {
diff --git a/v2/pkg/commands/build/base.go b/v2/pkg/commands/build/base.go
index 573fdafd..9bb19be5 100644
--- a/v2/pkg/commands/build/base.go
+++ b/v2/pkg/commands/build/base.go
@@ -383,8 +383,13 @@ Please reinstall by doing the following:
 }
 
 func generateRuntimeWrapper(options *Options) error {
+
 	if options.WailsJSDir == "" {
-		options.WailsJSDir = filepath.Join("./frontend")
+		cwd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+		options.WailsJSDir = filepath.Join(cwd, "frontend")
 	}
 	wrapperDir := filepath.Join(options.WailsJSDir, "wailsjs", "runtime")
 	_ = os.RemoveAll(wrapperDir)
diff --git a/v2/pkg/commands/build/build.go b/v2/pkg/commands/build/build.go
index fa5b60f6..091de85e 100644
--- a/v2/pkg/commands/build/build.go
+++ b/v2/pkg/commands/build/build.go
@@ -85,6 +85,8 @@ func Build(options *Options) (string, error) {
 	// wails js dir
 	if projectData.WailsJSDir != "" {
 		options.WailsJSDir = projectData.WailsJSDir
+	} else {
+		options.WailsJSDir = filepath.Join(cwd, "frontend")
 	}
 
 	// Set build directory