diff --git a/cmd/helpers.go b/cmd/helpers.go index da3e7a86..11425bf5 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -248,6 +248,22 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644) } + // Install the bridge library + err = InstallBridge(caller, projectDir, projectOptions) + if err != nil { + return err + } + + // Build frontend + err = BuildFrontend(projectOptions.FrontEnd.Build) + if err != nil { + return err + } + return nil +} + +// InstallBridge installs the relevant bridge javascript library +func InstallBridge(caller string, projectDir string, projectOptions *ProjectOptions) error { bridgeFile := "wailsbridge.prod.js" if caller == "serve" { bridgeFile = "wailsbridge.js" @@ -257,13 +273,7 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc bridgeAssets := mewn.Group("../wailsruntimeassets/bridge/") bridgeFileData := bridgeAssets.Bytes(bridgeFile) bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js") - err = fs.CreateFile(bridgeFileTarget, bridgeFileData) - if err != nil { - return err - } - - // Build frontend - err = BuildFrontend(projectOptions.FrontEnd.Build) + err := fs.CreateFile(bridgeFileTarget, bridgeFileData) if err != nil { return err } diff --git a/cmd/version.go b/cmd/version.go index 04a5c966..14739e8a 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ package cmd // Version - Wails version -const Version = "v0.11.6" +const Version = "v0.11.7" diff --git a/cmd/wails/6_serve.go b/cmd/wails/6_serve.go index 2d3afacd..aeb4a49b 100644 --- a/cmd/wails/6_serve.go +++ b/cmd/wails/6_serve.go @@ -41,6 +41,15 @@ func init() { return err } + // Save project directory + projectDir := fs.Cwd() + + // Install the bridge library + err = cmd.InstallBridge("serve", projectDir, projectOptions) + if err != nil { + return err + } + // Install dependencies err = cmd.InstallGoDependencies() if err != nil {