From 5994eb605f2035045872d9d5ed92e8c8b7ea31b6 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Wed, 13 Feb 2019 08:44:53 +1100
Subject: [PATCH] minor fixes to serve/build

---
 assets/default/wailsbridge.js      | 2 +-
 assets/default/wailsbridge.prod.js | 2 +-
 cmd/helpers.go                     | 5 ++++-
 cmd/wails/4_build.go               | 2 +-
 cmd/wails/6_serve.go               | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/assets/default/wailsbridge.js b/assets/default/wailsbridge.js
index fcc8c79b..0754c510 100644
--- a/assets/default/wailsbridge.js
+++ b/assets/default/wailsbridge.js
@@ -188,7 +188,7 @@ function startBridge() {
       // Call back
       case "c":
         var callbackData = message.data.slice(1);
-        log("Callback = " + callbackData);
+        window.wailsbridge.log("Callback = " + callbackData);
         window.wails._.callback(callbackData);
         break;
     }
diff --git a/assets/default/wailsbridge.prod.js b/assets/default/wailsbridge.prod.js
index b90882d2..62c72390 100644
--- a/assets/default/wailsbridge.prod.js
+++ b/assets/default/wailsbridge.prod.js
@@ -11,7 +11,7 @@ export default {
   // Passes the main Wails object to the callback if given.
   Start: function(callback) {
     if (callback) {
-      callback();
+      window.wails.events.on("wails:ready", callback);
     }
   }
 };
diff --git a/cmd/helpers.go b/cmd/helpers.go
index 13b290b3..6a5e600a 100644
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -134,7 +134,7 @@ func CheckPackr() (err error) {
 }
 
 // InstallFrontendDeps attempts to install the frontend dependencies based on the given options
-func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool) error {
+func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool, caller string) error {
 
 	// Install frontend deps
 	err := os.Chdir(projectOptions.FrontEnd.Dir)
@@ -189,6 +189,9 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	}
 
 	bridgeFile := "wailsbridge.prod.js"
+	if caller == "serve" {
+		bridgeFile = "wailsbridge.js"
+	}
 
 	// Copy bridge to project
 	_, filename, _, _ := runtime.Caller(1)
diff --git a/cmd/wails/4_build.go b/cmd/wails/4_build.go
index 2631c325..8ed2fa9e 100644
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -70,7 +70,7 @@ func init() {
 
 		// Install deps
 		if projectOptions.FrontEnd != nil {
-			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
+			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "build")
 			if err != nil {
 				return err
 			}
diff --git a/cmd/wails/6_serve.go b/cmd/wails/6_serve.go
index 0ab41f7d..50b1e66e 100644
--- a/cmd/wails/6_serve.go
+++ b/cmd/wails/6_serve.go
@@ -66,7 +66,7 @@ func init() {
 
 		// Install deps
 		if projectOptions.FrontEnd != nil {
-			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild)
+			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "serve")
 			if err != nil {
 				return err
 			}