diff --git a/v2/internal/appng/app_dev.go b/v2/internal/appng/app_dev.go index d61e4cc81..5cbc391c6 100644 --- a/v2/internal/appng/app_dev.go +++ b/v2/internal/appng/app_dev.go @@ -61,7 +61,7 @@ func CreateApp(appoptions *options.App) (*App, error) { // Check for CLI Flags assetdir := flag.String("assetdir", "", "Directory to serve assets") - devServerURL := flag.String("devserverurl", "http://localhost:34115", "URL of development server") + devServerURL := flag.String("devserverurl", "", "URL of development server") loglevel := flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error") flag.Parse() if devServerURL != nil && *devServerURL != "" { diff --git a/v2/internal/frontend/assetserver/assetserver_desktop.go b/v2/internal/frontend/assetserver/assetserver_desktop.go index 8a7039782..2127e767b 100644 --- a/v2/internal/frontend/assetserver/assetserver_desktop.go +++ b/v2/internal/frontend/assetserver/assetserver_desktop.go @@ -119,7 +119,6 @@ func (a *DesktopAssetServer) processIndexHTML() ([]byte, error) { log.Fatal(err) return nil, err } - fmt.Printf("%+v\n", wailsOptions) if wailsOptions.disableRuntimeInjection == false { indexHTML, err = injectHTML(string(indexHTML), ``) if err != nil { diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index 8cde58efe..b331afed4 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -35,8 +35,8 @@ type Frontend struct { debug bool // Assets - assets *assetserver.DesktopAssetServer - devServerURL string + assets *assetserver.DesktopAssetServer + startURL string // main window handle mainWindow *Window @@ -58,6 +58,7 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger. minWidth: appoptions.MinWidth, maxHeight: appoptions.MaxHeight, maxWidth: appoptions.MaxWidth, + startURL: "file://wails/", } bindingsJSON, err := appBindings.ToJSON() @@ -67,11 +68,9 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger. _devServerURL := ctx.Value("devserverurl") if _devServerURL != nil { - result.devServerURL = _devServerURL.(string) - if result.devServerURL == "" { - result.devServerURL = "http://localhost:34115" - } - if result.devServerURL != "http://localhost:34115" { + devServerURL := _devServerURL.(string) + if len(devServerURL) > 0 && devServerURL != "http://localhost:34115" { + result.startURL = devServerURL return result } } @@ -320,11 +319,7 @@ func (f *Frontend) setupChromium() { f.WindowSetRGBA(f.frontendOptions.RGBA) chromium.AddWebResourceRequestedFilter("*", edge.COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL) - if f.devServerURL == "http://localhost:34115" { - chromium.Navigate("file://wails/") - } else { - chromium.Navigate(f.devServerURL) - } + chromium.Navigate(f.startURL) } type EventNotify struct {