Merge pull request #46 from wailsapp/ignore-packr-findstring-errors-in-bridge-mode

Ignore packr findstring errors in bridge mode

app.go

@@ -7,7 +7,7 @@ import (
 // -------------------------------- Compile time Flags ------------------------------
 
 // BuildMode indicates what mode we are in
-var BuildMode = "prod"
+var BuildMode = cmd.BuildModeProd
 
 // ----------------------------------------------------------------------------------
 
@@ -53,7 +53,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	result.config = appconfig
 
 	// Set up the CLI if not in release mode
-	if BuildMode != "prod" {
+	if BuildMode != cmd.BuildModeProd {
 		result.cli = result.setupCli()
 	} else {
 		// Disable Inspector in release mode
@@ -65,7 +65,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 
 // Run the app
 func (a *App) Run() error {
-	if BuildMode != "prod" {
+	if BuildMode != cmd.BuildModeProd {
 		return a.cli.Run()
 	}
 
@@ -82,7 +82,7 @@ func (a *App) start() error {
 	a.log.Info("Starting")
 
 	// Check if we are to run in headless mode
-	if BuildMode == "bridge" {
+	if BuildMode == cmd.BuildModeBridge {
 		a.renderer = &Headless{}
 	}
 

cmd/build.go

@@ -0,0 +1,10 @@
+package cmd
+
+const (
+	// BuildModeProd indicates we are building for prod mode
+	BuildModeProd = "prod"
+	// BuildModeDebug indicates we are building for debug mode
+	BuildModeDebug = "debug"
+	// BuildModeBridge indicates we are building for bridge mode
+	BuildModeBridge = "bridge"
+)

cmd/helpers.go

@@ -49,7 +49,8 @@ func InstallGoDependencies() error {
 // BuildApplication will attempt to build the project based on the given inputs
 func BuildApplication(binaryName string, forceRebuild bool, buildMode string) error {
 	compileMessage := "Packing + Compiling project"
-	if buildMode == "debug" {
+
+	if buildMode == BuildModeDebug {
 		compileMessage += " (Debug Mode)"
 	}
 
@@ -72,7 +73,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string) er
 
 	// Setup ld flags
 	ldflags := "-w -s "
-	if buildMode == "debug" {
+	if buildMode == BuildModeDebug {
 		ldflags = ""
 	}
 	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode

cmd/wails/4_build.go

@@ -89,9 +89,9 @@ func init() {
 		}
 
 		// Build application
-		buildMode := "prod"
+		buildMode := cmd.BuildModeProd
 		if debugMode {
-			buildMode = "debug"
+			buildMode = cmd.BuildModeDebug
 		}
 		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)
 		if err != nil {

cmd/wails/6_serve.go

@@ -62,6 +62,8 @@ func init() {
 		}
 
 		// Save project directory
+		// TODO: Remove compiling frontend once packr
+		// allows optional boxes
 		projectDir := fs.Cwd()
 
 		// Install deps
@@ -84,7 +86,7 @@ func init() {
 			return err
 		}
 
-		buildMode := "bridge"
+		buildMode := cmd.BuildModeBridge
 		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)
 		if err != nil {
 			return err

renderer_headless.go

@@ -95,7 +95,7 @@ func (h *Headless) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Could not open websocket connection", http.StatusBadRequest)
 	}
 	h.theConnection = conn
-	h.log.Infof("Connection from frontend accepted.", h.theConnection)
+	h.log.Infof("Connection from frontend accepted [%p].", h.theConnection)
 	conn.SetCloseHandler(func(int, string) error {
 		h.log.Infof("Connection dropped [%p].", h.theConnection)
 		h.theConnection = nil

utils.go

@@ -4,6 +4,8 @@ import (
 	"log"
 	"strings"
 
+	"github.com/wailsapp/wails/cmd"
+
 	"github.com/gobuffalo/packr"
 )
 
@@ -18,6 +20,9 @@ func escapeJS(js string) (string, error) {
 func BoxString(box *packr.Box, filename string) string {
 	result, err := box.FindString(filename)
 	if err != nil {
+		if BuildMode == cmd.BuildModeBridge {
+			return ""
+		}
 		log.Fatal(err)
 	}
 	return result