deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 22:55:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

[v2] Fix -devserverurl flag

Browse source
This commit is contained in:
Lea Anthony 2021-10-03 16:44:37 +11:00
commit 1b28f69236
3 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
v2/internal/appng/app_dev.go
View file

@ -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 != "" {

1
v2/internal/frontend/assetserver/assetserver_desktop.go
View file

@ -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), `<script src="/wails/runtime.js"></script>`)
if err != nil {

19
v2/internal/frontend/desktop/windows/frontend.go
View file

@ -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 {