From 69ac5caa4b3a640f0e0b0319a8ff2dee0199dea8 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 1 Sep 2023 22:06:43 +1000 Subject: [PATCH] Fix production build --- v3/.gitignore | 1 + v3/cmd/wails3/main.go | 4 ++++ v3/go.mod | 3 +++ v3/pkg/application/application_production.go | 4 ++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/v3/.gitignore b/v3/.gitignore index 8f193787..d304da44 100644 --- a/v3/.gitignore +++ b/v3/.gitignore @@ -6,3 +6,4 @@ cmd/wails3/wails /examples/menu/menu /examples/clipboard/clipboard /examples/plain/plain +/cmd/wails3/ui/.task/ diff --git a/v3/cmd/wails3/main.go b/v3/cmd/wails3/main.go index 95038b61..f3e90965 100644 --- a/v3/cmd/wails3/main.go +++ b/v3/cmd/wails3/main.go @@ -3,6 +3,7 @@ package main import ( "github.com/pterm/pterm" "github.com/samber/lo" + "github.com/wailsapp/wails/v3/cmd/wails3/ui" "os" "runtime/debug" @@ -28,6 +29,9 @@ func main() { app := clir.NewCli("wails", "The Wails CLI", "v3") app.NewSubCommandFunction("build", "Build the project", commands.Build) app.NewSubCommandFunction("init", "Initialise a new project", commands.Init) + app.NewSubCommand("contribute", "Contribute to Wails development").Action(func() error { + return ui.Run() + }) task := app.NewSubCommand("task", "Run and list tasks") var taskFlags commands.RunTaskOptions task.AddFlags(&taskFlags) diff --git a/v3/go.mod b/v3/go.mod index f7eec2ed..5530e2cd 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -30,6 +30,7 @@ require ( github.com/tc-hib/winres v0.1.6 github.com/wailsapp/go-webview2 v1.0.5 github.com/wailsapp/mimetype v1.4.1 + github.com/wailsapp/wails/v3/cmd/wails3/ui v0.0.0-20210706143420-7d21f8c997e2 golang.org/x/net v0.7.0 golang.org/x/sys v0.11.0 modernc.org/sqlite v1.21.0 @@ -99,3 +100,5 @@ require ( ) replace github.com/ebitengine/purego v0.4.0-alpha.4 => github.com/tmclane/purego v0.0.0-20230601213035-1f25e70d7b01 + +replace github.com/wailsapp/wails/v3/cmd/wails3/ui => D:\GolandProjects\wails\v3\cmd\wails3\ui diff --git a/v3/pkg/application/application_production.go b/v3/pkg/application/application_production.go index 4ebf3968..7b4b2e6c 100644 --- a/v3/pkg/application/application_production.go +++ b/v3/pkg/application/application_production.go @@ -2,10 +2,10 @@ package application -func newApplication(options *Options) *App { +func newApplication(options Options) *App { result := &App{ isDebugMode: false, - options: options.getOptions(false), + options: options, } result.init() return result