From 24e4fbfb686908c3a236d47802f0deabc1ea2189 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 8 Mar 2019 20:38:55 +1100 Subject: [PATCH] ignore frontend files when using wails serve --- cmd/helpers.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/cmd/helpers.go b/cmd/helpers.go index d34c80eb2..88dec69d0 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -5,11 +5,11 @@ import ( "io/ioutil" "os" "os/exec" - "path" "path/filepath" "runtime" "time" + mewn "github.com/leaanthony/mewn" "github.com/leaanthony/slicer" "github.com/leaanthony/spinner" ) @@ -77,7 +77,13 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa packSpinner.Start() buildCommand := slicer.String() - buildCommand.AddSlice([]string{"mewn", "build"}) + buildCommand.Add("mewn") + + if buildMode == BuildModeBridge { + // Ignore errors + buildCommand.Add("-i") + } + buildCommand.Add("build") if binaryName != "" { buildCommand.Add("-o") @@ -240,10 +246,10 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc } // Copy bridge to project - _, filename, _, _ := runtime.Caller(1) - bridgeFileSource := filepath.Join(path.Dir(filename), "..", "..", "wailsruntimeassets", "bridge", bridgeFile) + bridgeAssets := mewn.Group("../wailsruntimeassets/bridge/") + bridgeFileData := bridgeAssets.Bytes(bridgeFile) bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js") - err = fs.CopyFile(bridgeFileSource, bridgeFileTarget) + err = fs.CreateFile(bridgeFileTarget, bridgeFileData) if err != nil { return err }