diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 0b1397fb5..1c31a1cba 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -11,7 +11,9 @@ body: Before submitting this issue, please do the following: - Do a web search for your error. This usually leads to a much better understanding of the issue. - Prove that the error is indeed a Wails bug and not an application bug, with a specific set of steps to reproduce. - - Search both the issue tracker (even closed issues) and discussion forums. + - Search the issue tracker using [this link](https://github.com/wailsapp/wails/issues?q=is%3Aissue+). + - Search the [discussion forums](https://github.com/wailsapp/wails/discussions?discussions_q=type+your+issue+here). + - Read the [Troubleshooting Guide](https://wails.io/docs/next/guides/troubleshooting). - Try to fix it yourself. Keep a list of things you have done to fix the problem. If after doing all the above, the problem remains, please continue with this ticket providing *all* the information requested. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 317b10cdd..292a039a2 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -7,6 +7,7 @@ body: - type: markdown attributes: value: | + Before opening a feature request, please check the [Roadmap](https://github.com/wailsapp/wails/discussions/1484) to see if it has already been requested. ***Please note: No new feature requests are being accepted for Wails v1*** - type: textarea diff --git a/.github/stale.yml b/.github/stale.yml index a0c92fdff..c99691f70 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -8,7 +8,7 @@ exemptLabels: - security - onhold - inprogress - - "Selected for development" + - "Selected For Development" # Label to use when marking an issue as stale staleLabel: wontfix # Comment to post when marking an issue as stale. Set to `false` to disable diff --git a/README.md b/README.md index d846b36d1..9544568ea 100644 --- a/README.md +++ b/README.md @@ -106,8 +106,8 @@ This project is supported by these kind people / companies: - - + +

@@ -158,9 +158,6 @@ This project is supported by these kind people / companies: - - - @@ -194,12 +191,23 @@ This project is supported by these kind people / companies: - - + + + + + + + + +## Roadmap + +The project roadmap may be found [here](https://github.com/wailsapp/wails/discussions/1484). Please consult +this before open up an enhancement request. + ## Installation The installation instructions are on the [official website](https://wails.io/docs/gettingstarted/installation). @@ -211,8 +219,8 @@ The installation instructions are on the [official website](https://wails.io/doc - Is this an alternative to Electron? Depends on your requirements. It's designed to make it easy for Go programmers to make lightweight desktop - applications or add a frontend to their existing applications. Whilst Wails does not currently offer hooks into native - elements such as menus, this may change in the future. + applications or add a frontend to their existing applications. Wails v2 does offer native elements such as menus + and dialogs, so it is becoming a lightweight electron alternative. - Who is this project aimed at? diff --git a/README.zh-Hans.md b/README.zh-Hans.md index 014104a74..334ece9b6 100644 --- a/README.zh-Hans.md +++ b/README.zh-Hans.md @@ -116,8 +116,8 @@ Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝 - - + +

@@ -168,9 +168,6 @@ Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝 - - - @@ -204,8 +201,14 @@ Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝 - - + + + + + + + + diff --git a/v2/cmd/wails/internal/commands/build/build.go b/v2/cmd/wails/internal/commands/build/build.go index 22134658a..bffff9e52 100644 --- a/v2/cmd/wails/internal/commands/build/build.go +++ b/v2/cmd/wails/internal/commands/build/build.go @@ -99,6 +99,12 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { trimpath := false command.BoolFlag("trimpath", "Remove all file system paths from the resulting executable", &trimpath) + raceDetector := false + command.BoolFlag("race", "Build with Go's race detector", &raceDetector) + + windowsConsole := false + command.BoolFlag("windowsconsole", "Keep the console when building for Windows", &windowsConsole) + command.Action(func() error { quiet := verbosity == 0 @@ -180,6 +186,8 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { UserTags: userTags, WebView2Strategy: wv2rtstrategy, TrimPath: trimpath, + RaceDetector: raceDetector, + WindowsConsole: windowsConsole, } // Start a new tabwriter @@ -197,6 +205,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { _, _ = fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory) _, _ = fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags) _, _ = fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ",")) + _, _ = fmt.Fprintf(w, "Race Detector: \t%t\n", buildOptions.RaceDetector) if len(buildOptions.OutputFile) > 0 && targets.Length() == 1 { _, _ = fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile) } @@ -229,6 +238,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { "linux", "linux/amd64", "linux/arm64", + "linux/arm", "windows", "windows/amd64", "windows/arm64", @@ -259,10 +269,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { // Calculate platform and arch platformSplit := strings.Split(platform, "/") buildOptions.Platform = platformSplit[0] + buildOptions.Arch = runtime.GOARCH if system.IsAppleSilicon { buildOptions.Arch = "arm64" - } else { - buildOptions.Arch = runtime.GOARCH } if len(platformSplit) == 2 { buildOptions.Arch = platformSplit[1] @@ -330,7 +339,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) { // Output stats buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.\n", outputFilename, time.Since(start).Round(time.Millisecond).String())) - outputBinaries[platform] = outputFilename + outputBinaries[buildOptions.Platform+"/"+buildOptions.Arch] = outputFilename }) if targetErr != nil { diff --git a/v2/cmd/wails/internal/commands/dev/dev.go b/v2/cmd/wails/internal/commands/dev/dev.go index 712e7ea65..97604ee33 100644 --- a/v2/cmd/wails/internal/commands/dev/dev.go +++ b/v2/cmd/wails/internal/commands/dev/dev.go @@ -2,6 +2,7 @@ package dev import ( "context" + "errors" "fmt" "io" "net" @@ -36,16 +37,25 @@ import ( ) func LogGreen(message string, args ...interface{}) { + if len(message) == 0 { + return + } text := fmt.Sprintf(message, args...) println(colour.Green(text)) } func LogRed(message string, args ...interface{}) { + if len(message) == 0 { + return + } text := fmt.Sprintf(message, args...) println(colour.Red(text)) } func LogDarkYellow(message string, args ...interface{}) { + if len(message) == 0 { + return + } text := fmt.Sprintf(message, args...) println(colour.DarkYellow(text)) } @@ -66,6 +76,7 @@ type devFlags struct { reloadDirs string openBrowser bool noReload bool + noGen bool wailsjsdir string tags string verbosity int @@ -75,6 +86,7 @@ type devFlags struct { devServer string appargs string saveConfig bool + raceDetector bool frontendDevServerURL string } @@ -92,6 +104,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { command.StringFlag("reloaddirs", "Additional directories to trigger reloads (comma separated)", &flags.reloadDirs) command.BoolFlag("browser", "Open application in browser", &flags.openBrowser) command.BoolFlag("noreload", "Disable reload on asset change", &flags.noReload) + command.BoolFlag("nogen", "Disable generate module", &flags.noGen) command.StringFlag("wailsjsdir", "Directory to generate the Wails JS modules", &flags.wailsjsdir) command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &flags.tags) command.IntFlag("v", "Verbosity level (0 - silent, 1 - standard, 2 - verbose)", &flags.verbosity) @@ -100,8 +113,9 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { command.IntFlag("debounce", "The amount of time to wait to trigger a reload on change", &flags.debounceMS) command.StringFlag("devserver", "The address of the wails dev server", &flags.devServer) command.StringFlag("frontenddevserverurl", "The url of the external frontend dev server to use", &flags.frontendDevServerURL) - command.StringFlag("appargs", "arguments to pass to the underlying app (quoted and space searated)", &flags.appargs) + command.StringFlag("appargs", "arguments to pass to the underlying app (quoted and space separated)", &flags.appargs) command.BoolFlag("save", "Save given flags as defaults", &flags.saveConfig) + command.BoolFlag("race", "Build with Go's race detector", &flags.raceDetector) command.Action(func() error { // Create logger @@ -148,22 +162,22 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { return err } - self := os.Args[0] - if flags.tags != "" { - err = runCommand(cwd, true, self, "generate", "module", "-tags", flags.tags) - } else { - err = runCommand(cwd, true, self, "generate", "module") - } - if err != nil { - return err + if !flags.noGen { + self := os.Args[0] + if flags.tags != "" { + err = runCommand(cwd, true, self, "generate", "module", "-tags", flags.tags) + } else { + err = runCommand(cwd, true, self, "generate", "module") + } + if err != nil { + return err + } } buildOptions := generateBuildOptions(flags) buildOptions.Logger = logger buildOptions.UserTags = internal.ParseUserTags(flags.tags) - var debugBinaryProcess *process.Process = nil - // Setup signal handler quitChannel := make(chan os.Signal, 1) signal.Notify(quitChannel, os.Interrupt, os.Kill, syscall.SIGTERM) @@ -171,19 +185,23 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { // Do initial build logger.Println("Building application for development...") - newProcess, appBinary, err := restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel) + debugBinaryProcess, appBinary, err := restartApp(buildOptions, nil, flags, exitCodeChannel) if err != nil { return err } - if newProcess != nil { - debugBinaryProcess = newProcess - } + defer func() { + if err := killProcessAndCleanupBinary(debugBinaryProcess, appBinary); err != nil { + LogDarkYellow("Unable to kill process and cleanup binary: %s", err) + } + }() // frontend:dev:watcher command. if command := projectConfig.DevWatcherCommand; command != "" { - var devCommandWaitGroup sync.WaitGroup - closer := runFrontendDevWatcherCommand(cwd, command, &devCommandWaitGroup) - defer closer(&devCommandWaitGroup) + closer, err := runFrontendDevWatcherCommand(cwd, command) + if err != nil { + return err + } + defer closer() } // open browser @@ -215,22 +233,17 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { LogGreen("Using reload debounce setting of %d milliseconds", flags.debounceMS) // Watch for changes and trigger restartApp() - doWatcherLoop(buildOptions, debugBinaryProcess, flags, watcher, exitCodeChannel, quitChannel, devServerURL) + debugBinaryProcess = doWatcherLoop(buildOptions, debugBinaryProcess, flags, watcher, exitCodeChannel, quitChannel, devServerURL) - // Kill the current program if running - if debugBinaryProcess != nil { - err := debugBinaryProcess.Kill() - if err != nil { - return err - } - } - - // Remove dev binary - err = os.Remove(appBinary) - if err != nil { + // Kill the current program if running and remove dev binary + if err := killProcessAndCleanupBinary(debugBinaryProcess, appBinary); err != nil { return err } + // Reset the process and the binary so the defer knows about it and is a nop. + debugBinaryProcess = nil + appBinary = "" + LogGreen("Development mode exited") return nil @@ -238,6 +251,22 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { return nil } +func killProcessAndCleanupBinary(process *process.Process, binary string) error { + if process != nil && process.Running { + if err := process.Kill(); err != nil { + return err + } + } + + if binary != "" { + err := os.Remove(binary) + if err != nil && !errors.Is(err, os.ErrNotExist) { + return err + } + } + return nil +} + func syncGoModVersion(cwd string) error { gomodFilename := filepath.Join(cwd, "go.mod") gomodData, err := os.ReadFile(gomodFilename) @@ -299,6 +328,7 @@ func generateBuildOptions(flags devFlags) *build.Options { IgnoreFrontend: false, Verbosity: flags.verbosity, WailsJSDir: flags.wailsjsdir, + RaceDetector: flags.raceDetector, } return result @@ -381,35 +411,39 @@ func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, e } // runFrontendDevWatcherCommand will run the `frontend:dev:watcher` command if it was given, ex- `npm run dev` -func runFrontendDevWatcherCommand(cwd string, devCommand string, wg *sync.WaitGroup) func(group *sync.WaitGroup) { - LogGreen("Running frontend dev watcher command: '%s'", devCommand) +func runFrontendDevWatcherCommand(cwd string, devCommand string) (func(), error) { ctx, cancel := context.WithCancel(context.Background()) dir := filepath.Join(cwd, "frontend") cmdSlice := strings.Split(devCommand, " ") - wg.Add(1) cmd := exec.CommandContext(ctx, cmdSlice[0], cmdSlice[1:]...) cmd.Stderr = os.Stderr cmd.Stdout = os.Stdout cmd.Dir = dir - setParentGID(cmd) - go func(ctx context.Context, devCommand string, cwd string, wg *sync.WaitGroup) { - err := cmd.Run() - if err != nil { + if err := cmd.Start(); err != nil { + cancel() + return nil, fmt.Errorf("Unable to start frontend DevWatcher: %w", err) + } + + LogGreen("Running frontend DevWatcher command: '%s'", devCommand) + var wg sync.WaitGroup + wg.Add(1) + go func() { + if err := cmd.Wait(); err != nil { if err.Error() != "exit status 1" { - LogRed("Error from '%s': %s", devCommand, err.Error()) + LogRed("Error from DevWatcher '%s': %s", devCommand, err.Error()) } } - LogGreen("Dev command exited!") + LogGreen("DevWatcher command exited!") wg.Done() - }(ctx, devCommand, cwd, wg) + }() - return func(wg *sync.WaitGroup) { + return func() { killProc(cmd, devCommand) - LogGreen("Dev command killed!") + LogGreen("DevWatcher command killed!") cancel() wg.Wait() - } + }, nil } // initialiseWatcher creates the project directory watcher that will trigger recompile @@ -456,8 +490,13 @@ func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process appBinary, err := build.Build(buildOptions) println() if err != nil { - LogRed("Build error - continuing to run current version") - LogDarkYellow(err.Error()) + LogRed("Build error - " + err.Error()) + + msg := "Continuing to run current version" + if debugBinaryProcess == nil { + msg = "No version running, build will be retriggered as soon as changes have been detected" + } + LogDarkYellow(msg) return nil, "", nil } @@ -503,12 +542,8 @@ func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process } // doWatcherLoop is the main watch loop that runs while dev is active -func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Process, flags devFlags, watcher *fsnotify.Watcher, exitCodeChannel chan int, quitChannel chan os.Signal, devServerURL *url.URL) { +func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Process, flags devFlags, watcher *fsnotify.Watcher, exitCodeChannel chan int, quitChannel chan os.Signal, devServerURL *url.URL) *process.Process { // Main Loop - var ( - err error - newBinaryProcess *process.Process - ) var extensionsThatTriggerARebuild = sliceToMap(strings.Split(flags.extensions, ",")) var dirsThatTriggerAReload []string for _, dir := range strings.Split(flags.reloadDirs, ",") { @@ -534,7 +569,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc assetDirURL := joinPath(devServerURL, "/wails/assetdir") reloadURL := joinPath(devServerURL, "/wails/reload") for quit == false { - //reload := false + // reload := false select { case exitCode := <-exitCodeChannel: if exitCode == 0 { @@ -579,7 +614,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc if item.Op&fsnotify.Create == fsnotify.Create { // If this is a folder, add it to our watch list if fs.DirExists(item.Name) { - //node_modules is BANNED! + // node_modules is BANNED! if !strings.Contains(item.Name, "node_modules") { err := watcher.Add(item.Name) if err != nil { @@ -594,7 +629,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc rebuild = false LogGreen("[Rebuild triggered] files updated") // Try and build the app - newBinaryProcess, _, err = restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel) + newBinaryProcess, _, err := restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel) if err != nil { LogRed("Error during build: %s", err.Error()) continue @@ -640,7 +675,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc } if reload { reload = false - _, err = http.Get(reloadURL) + _, err := http.Get(reloadURL) if err != nil { LogRed("Error during refresh: %s", err.Error()) } @@ -650,6 +685,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc quit = true } } + return debugBinaryProcess } func joinPath(url *url.URL, subPath string) string { diff --git a/v2/cmd/wails/internal/commands/dev/dev_other.go b/v2/cmd/wails/internal/commands/dev/dev_other.go index 15267ceb2..c93aecfe4 100644 --- a/v2/cmd/wails/internal/commands/dev/dev_other.go +++ b/v2/cmd/wails/internal/commands/dev/dev_other.go @@ -6,6 +6,8 @@ package dev import ( "os/exec" "syscall" + + "golang.org/x/sys/unix" ) func setParentGID(cmd *exec.Cmd) { @@ -15,6 +17,10 @@ func setParentGID(cmd *exec.Cmd) { } func killProc(cmd *exec.Cmd, devCommand string) { + if cmd == nil || cmd.Process == nil { + return + } + // Experiencing the same issue on macOS BigSur // I'm using Vite, but I would imagine this could be an issue with Node (npm) in general // Also, after several edit/rebuild cycles any abnormal shutdown (crash or CTRL-C) may still leave Node running @@ -22,7 +28,7 @@ func killProc(cmd *exec.Cmd, devCommand string) { // Not tested on *nix pgid, err := syscall.Getpgid(cmd.Process.Pid) if err == nil { - err := syscall.Kill(-pgid, 15) // note the minus sign + err := syscall.Kill(-pgid, unix.SIGTERM) // note the minus sign if err != nil { LogRed("Error from '%s' when attempting to kill the process: %s", devCommand, err.Error()) } diff --git a/v2/cmd/wails/internal/commands/generate/module.go b/v2/cmd/wails/internal/commands/generate/module.go index d4b87f392..62d8257c7 100644 --- a/v2/cmd/wails/internal/commands/generate/module.go +++ b/v2/cmd/wails/internal/commands/generate/module.go @@ -50,10 +50,8 @@ func AddModuleCommand(app *clir.Cli, parent *clir.Command, w io.Writer) error { return fmt.Errorf("%s\n%s\n%s", stdout, stderr, err) } - err = os.Remove(filename) - if err != nil { - return err - } + // Best effort removal of temp file + _ = os.Remove(filename) return nil }) diff --git a/v2/cmd/wails/internal/commands/generate/template/base/go.sum b/v2/cmd/wails/internal/commands/generate/template/base/go.sum index 63a3181cc..92f4d6d57 100644 --- a/v2/cmd/wails/internal/commands/generate/template/base/go.sum +++ b/v2/cmd/wails/internal/commands/generate/template/base/go.sum @@ -53,8 +53,6 @@ github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oO github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA= github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4= github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM= -github.com/leaanthony/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y= -github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0= github.com/leaanthony/gosod v1.0.3 h1:Fnt+/B6NjQOVuCWOKYRREZnjGyvg+mEhd1nkkA04aTQ= github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4= github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA= diff --git a/v2/cmd/wails/internal/commands/generate/template/base/go.tmpl.mod b/v2/cmd/wails/internal/commands/generate/template/base/go.tmpl.mod index 1555a4829..fcef41340 100644 --- a/v2/cmd/wails/internal/commands/generate/template/base/go.tmpl.mod +++ b/v2/cmd/wails/internal/commands/generate/template/base/go.tmpl.mod @@ -12,7 +12,6 @@ module changeme github.com/labstack/echo/v4 v4.7.2 // indirect github.com/labstack/gommon v0.3.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect diff --git a/v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go b/v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go index c7740ebd0..9c15b8740 100644 --- a/v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go @@ -35,7 +35,7 @@ func main() { Frameless: false, StartHidden: false, HideWindowOnClose: false, - RGBA: &options.RGBA{R: 255, G: 255, B: 255, A: 255}, + BackgroundColour: &options.RGBA{R: 255, G: 255, B: 255, A: 255}, Assets: assets, Menu: nil, Logger: nil, diff --git a/v2/cmd/wails/internal/commands/initialise/initialise.go b/v2/cmd/wails/internal/commands/initialise/initialise.go index 54205e1d6..13a6483bc 100644 --- a/v2/cmd/wails/internal/commands/initialise/initialise.go +++ b/v2/cmd/wails/internal/commands/initialise/initialise.go @@ -216,6 +216,16 @@ func initGit(options *templates.Options) error { return errors.Wrap(err, "Unable to initialise git repository:") } + ignore := []string{ + "build/bin", + "frontend/dist", + "frontend/node_modules", + } + err = os.WriteFile(filepath.Join(options.TargetDir, ".gitignore"), []byte(strings.Join(ignore, "\n")), 0644) + if err != nil { + return errors.Wrap(err, "Unable to create gitignore") + } + return nil } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/lit-ts/frontend/src/my-element.ts b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/lit-ts/frontend/src/my-element.ts index fc5ebbbed..1b313b759 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/lit-ts/frontend/src/my-element.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/lit-ts/frontend/src/my-element.ts @@ -68,32 +68,31 @@ export class MyElement extends LitElement { } ` -} -@property() -resultText = "Please enter your name below 👇" + @property() + resultText = "Please enter your name below 👇" -greet() -{ - let thisName = this.shadowRoot.getElementById('name').value - Greet(thisName).then(result => { - this.resultText = result - }); -} + greet() { + let thisName = (this.shadowRoot.getElementById('name') as HTMLInputElement)?.value; + if (thisName) { + Greet(thisName).then(result => { + this.resultText = result + }); + } + } -render() -{ - return html` -
- -
${this.resultText}
-
- - -
-
- ` -} + render() { + return html` +
+ +
${this.resultText}
+
+ + +
+
+ ` + } } declare global { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact-ts/frontend/src/app.tsx b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact-ts/frontend/src/app.tsx index bffcb461c..05d7c32d0 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact-ts/frontend/src/app.tsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact-ts/frontend/src/app.tsx @@ -19,7 +19,7 @@ export function App(props: any) {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/app.jsx b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/app.jsx index a50cfd089..1ada97ac4 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/app.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/app.jsx @@ -19,7 +19,7 @@ export function App(props) {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/main.jsx b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/main.jsx index 41787dabc..5a7bfa9ea 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/main.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/preact/frontend/src/main.jsx @@ -1,5 +1,14 @@ -import {render} from 'preact'; -import {App} from './app'; -import './style.css'; +import React from 'react' +import { createRoot } from 'react-dom/client' +import './style.css' +import App from './App' -render(, document.getElementById('app')); +const container = document.getElementById('root') + +const root = createRoot(container) + +root.render( + + + +) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/App.tsx b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/App.tsx index 7895c66cf..a6e56f9f8 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/App.tsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/App.tsx @@ -18,7 +18,7 @@ function App() {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/main.tsx b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/main.tsx index a6c27f6a8..361c8d660 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/main.tsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react-ts/frontend/src/main.tsx @@ -1,11 +1,14 @@ import React from 'react' -import ReactDOM from 'react-dom' +import { createRoot } from 'react-dom/client' import './style.css' import App from './App' -ReactDOM.render( - - - , - document.getElementById('root') +const container = document.getElementById('root') + +const root = createRoot(container!) + +root.render( + + + ) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/App.jsx b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/App.jsx index 071423476..fd762291f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/App.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/App.jsx @@ -18,7 +18,7 @@ function App() {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/main.jsx b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/main.jsx index a6c27f6a8..5a7bfa9ea 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/main.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/assets/react/frontend/src/main.jsx @@ -1,11 +1,14 @@ import React from 'react' -import ReactDOM from 'react-dom' +import { createRoot } from 'react-dom/client' import './style.css' import App from './App' -ReactDOM.render( - - - , - document.getElementById('root') +const container = document.getElementById('root') + +const root = createRoot(container) + +root.render( + + + ) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/generate.go b/v2/cmd/wails/internal/commands/initialise/templates/generate/generate.go index 329cad6b4..a488f0fbf 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/generate.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/generate.go @@ -7,7 +7,7 @@ import ( "github.com/leaanthony/debme" "github.com/leaanthony/gosod" - "github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise/templates/generate/s" + "github.com/wailsapp/wails/v2/internal/s" ) //go:embed assets/common/* @@ -163,6 +163,13 @@ func main() { for _, t := range templates { createTemplate(t) } + + // copy plain template + s.ECHO("Copying plain template") + s.RMDIR("../templates/plain") + s.COPYDIR("plain", "../templates/plain") + + s.ECHO(`Until an auto fix is done, add "@babel/types": "^7.17.10" to vite-ts/frontend/package.json`) } func rebuildRuntime() { @@ -220,16 +227,5 @@ func createTemplate(template *template) { err = g.Extract(".", nil) checkError(err) - //s.ECHO("HERE") - //s.EXEC("wails init -n " + shortName + "test -t ./" + shortName) - //s.ECHO("HERE") - //s.CD(shortName + "test") - //s.ECHO("HERE") - //s.REPLACEALL("go.mod", s.Sub{"// replace": "replace"}) - //s.ECHO("HERE") - //s.EXEC("wails build -debug") - //s.ECHO("HERE") s.CD(cwd) - - s.ECHO(`Until an auto fix is done, add "@babel/types": "^7.17.10" to vite-ts/frontend/package.json`) } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/.gitignore b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/.gitignore new file mode 100644 index 000000000..b92a6f8bf --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/.gitignore @@ -0,0 +1,12 @@ +# Wails bin directory +build/bin +# Wails Windows NSIS support files +build/windows/installer/wails_tools.nsh +build/windows/installer/tmp/ + +# IDEs +.idea +.vscode + +# The black hole that is... +node_modules diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/README.md b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/README.md new file mode 100644 index 000000000..9fcd85bdd --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/README.md @@ -0,0 +1,18 @@ +# README + +## About + +This template uses plain JS / HTML and CSS. + +You can configure the project by editing `wails.json`. More information about the project settings can be found +here: https://wails.io/docs/reference/project-config + +## Live Development + +To run in live development mode, run `wails dev` in the project directory. The frontend dev server will run +on http://localhost:34115. Open this in your browser to connect to your application. + +## Building + +For a production build, use `wails build`. + diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/app.go b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/app.go new file mode 100644 index 000000000..224be7156 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/app.go @@ -0,0 +1,44 @@ +package main + +import ( + "context" + "fmt" +) + +// App struct +type App struct { + ctx context.Context +} + +// NewApp creates a new App application struct +func NewApp() *App { + return &App{} +} + +// startup is called at application startup +func (a *App) startup(ctx context.Context) { + // Perform your setup here + a.ctx = ctx +} + +// domReady is called after front-end resources have been loaded +func (a App) domReady(ctx context.Context) { + // Add your action here +} + +// beforeClose is called when the application is about to quit, +// either by clicking the window close button or calling runtime.Quit. +// Returning true will cause the application to continue, false will continue shutdown as normal. +func (a *App) beforeClose(ctx context.Context) (prevent bool) { + return false +} + +// shutdown is called at application termination +func (a *App) shutdown(ctx context.Context) { + // Perform your teardown here +} + +// Greet returns a greeting for the given name +func (a *App) Greet(name string) string { + return fmt.Sprintf("Hello %s, It's show time!", name) +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/fonts/OFL.txt b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/fonts/OFL.txt new file mode 100644 index 000000000..9cac04ce8 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com), + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/fonts/nunito-v16-latin-regular.woff2 b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/fonts/nunito-v16-latin-regular.woff2 new file mode 100644 index 000000000..2f9cc5964 Binary files /dev/null and b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/fonts/nunito-v16-latin-regular.woff2 differ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/images/logo-universal.png b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/images/logo-universal.png new file mode 100644 index 000000000..be568b847 Binary files /dev/null and b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/assets/images/logo-universal.png differ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/index.tmpl.html b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/index.tmpl.html new file mode 100644 index 000000000..e904c489c --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/index.tmpl.html @@ -0,0 +1,21 @@ + + + + + + {{.ProjectName}} + + + + +
+ +
Please enter your name below 👇
+
+ + +
+
+ + + diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/main.css b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/main.css new file mode 100644 index 000000000..dab87d09a --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/main.css @@ -0,0 +1,82 @@ +html { + background-color: rgba(27, 38, 54, 1); + text-align: center; + color: white; +} + +body { + margin: 0; + color: white; + font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", + "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", + sans-serif; +} + +@font-face { + font-family: "Nunito"; + font-style: normal; + font-weight: 400; + src: local(""), + url("assets/fonts/nunito-v16-latin-regular.woff2") format("woff2"); +} + +#app { + height: 100vh; + text-align: center; +} + +.logo { + display: block; + width: 50%; + height: 50%; + margin: auto; + padding: 10% 0 0; + background-position: center; + background-repeat: no-repeat; + background-image: url("./assets/images/logo-universal.png"); + background-size: 100% 100%; + background-origin: content-box; +} + +.result { + height: 20px; + line-height: 20px; + margin: 1.5rem auto; +} + +.input-box .btn { + width: 60px; + height: 30px; + line-height: 30px; + border-radius: 3px; + border: none; + margin: 0 0 0 20px; + padding: 0 8px; + cursor: pointer; +} + +.input-box .btn:hover { + background-image: linear-gradient(to top, #cfd9df 0%, #e2ebf0 100%); + color: #333333; +} + +.input-box .input { + border: none; + border-radius: 3px; + outline: none; + height: 30px; + line-height: 30px; + padding: 0 10px; + background-color: rgba(240, 240, 240, 1); + -webkit-font-smoothing: antialiased; +} + +.input-box .input:hover { + border: none; + background-color: rgba(255, 255, 255, 1); +} + +.input-box .input:focus { + border: none; + background-color: rgba(255, 255, 255, 1); +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/main.js b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/main.js new file mode 100644 index 000000000..3346d59ff --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/main.js @@ -0,0 +1,32 @@ +// Get input + focus +let nameElement = document.getElementById("name"); +nameElement.focus(); + +// Setup the greet function +window.greet = function () { + // Get name + let name = nameElement.value; + + // Check if the input is empty + if (name === "") return; + + // Call App.Greet(name) + try { + window.go.main.App.Greet(name) + .then((result) => { + // Update result with data back from App.Greet() + document.getElementById("result").innerText = result; + }) + .catch((err) => { + console.error(err); + }); + } catch (err) { + console.error(err); + } +}; + +nameElement.onkeydown = function (e) { + if (e.keyCode == 13) { + window.greet(); + } +}; diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/go.mod.tmpl b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/go.mod.tmpl new file mode 100644 index 000000000..27a2d22f4 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/go.mod.tmpl @@ -0,0 +1,34 @@ +module changeme + +go 1.17 + +require github.com/wailsapp/wails/v2 {{.WailsVersion}} + +require ( +github.com/andybalholm/brotli v1.0.2 // indirect +github.com/davecgh/go-spew v1.1.1 // indirect +github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect +github.com/wailsapp/mimetype v1.4.1-beta.1 +github.com/go-ole/go-ole v1.2.5 // indirect +github.com/gofiber/fiber/v2 v2.17.0 // indirect +github.com/gofiber/websocket/v2 v2.0.8 // indirect +github.com/google/uuid v1.1.2 // indirect +github.com/imdario/mergo v0.3.12 // indirect +github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 // indirect +github.com/klauspost/compress v1.12.2 // indirect +github.com/leaanthony/debme v1.2.1 // indirect +github.com/leaanthony/go-ansi-parser v1.0.1 // indirect +github.com/leaanthony/slicer v1.5.0 // indirect +github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect +github.com/pkg/errors v0.9.1 // indirect +github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect +github.com/tkrajina/go-reflector v0.5.5 // indirect +github.com/valyala/bytebufferpool v1.0.0 // indirect +github.com/valyala/fasthttp v1.28.0 // indirect +github.com/valyala/tcplisten v1.0.0 // indirect +golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect +) + +// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/go.sum b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/go.sum new file mode 100644 index 000000000..3e14e745f --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/go.sum @@ -0,0 +1,220 @@ +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E= +github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab h1:9e2joQGp642wHGFP5m86SDptAavrdGBe8/x9DGEEAaI= +github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab/go.mod h1:smsv/h4PBEBaU0XDTY5UwJTpZv69fQ0FfcLJr21mA6Y= +github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/flytam/filenamify v1.0.0/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/wailsapp/mimetype v1.4.1-beta.1 h1:gSnKX7WH+7aA0EEjOGUmpWXTb0Nt5B7/8Dm9wHLrnnY= +github.com/wailsapp/mimetype v1.4.1-beta.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw= +github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= +github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= +github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gofiber/fiber/v2 v2.17.0 h1:qP3PkGUbBB0i9iQh5E057XI1yO5CZigUxZhyUFYAFoM= +github.com/gofiber/fiber/v2 v2.17.0/go.mod h1:iftruuHGkRYGEXVISmdD7HTYWyfS2Bh+Dkfq4n/1Owg= +github.com/gofiber/websocket/v2 v2.0.8 h1:Hb4y6IxYZVMO0segROODXJiXVgVD3a6i7wnfot8kM6k= +github.com/gofiber/websocket/v2 v2.0.8/go.mod h1:fv8HSGQX09sauNv9g5Xq8GeGAaahLFYQKKb4ZdT0x2w= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= +github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck= +github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= +github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.12.2 h1:2KCfW3I9M7nSc5wOqXAlW2v2U6v+w6cbjvbfp+OykW8= +github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0= +github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc= +github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA= +github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4= +github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM= +github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4= +github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA= +github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY= +github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY= +github.com/leaanthony/typescriptify-golang-structs v0.1.7 h1:yoznzWzyxkO/iWdlpq+aPcuJ5Y/hpjq/lmgMFmpjwl0= +github.com/leaanthony/typescriptify-golang-structs v0.1.7/go.mod h1:cWtOkiVhMF77e6phAXUcfNwYmMwCJ67Sij24lfvi9Js= +github.com/leaanthony/winicon v1.0.0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= +github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 h1:acNfDZXmm28D2Yg/c3ALnZStzNaZMSagpbr96vY6Zjc= +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f h1:PgA+Olipyj258EIEYnpFFONrrCcAIWNUNoFhUfMqAGY= +github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f/go.mod h1:lHhJedqxCoHN+zMtwGNTXWmF0u9Jt363FYRhV6g0CdY= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tc-hib/winres v0.1.5/go.mod h1:pe6dOR40VOrGz8PkzreVKNvEKnlE8t4yR8A8naL+t7A= +github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs= +github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ= +github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk= +github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tidwall/sjson v1.1.7/go.mod h1:w/yG+ezBeTdUxiKs5NcPicO9diP38nk96QBAbIIGeFs= +github.com/tkrajina/go-reflector v0.5.5 h1:gwoQFNye30Kk7NrExj8zm3zFtrGPqOkzFMLuQZg1DtQ= +github.com/tkrajina/go-reflector v0.5.5/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.9.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasthttp v1.26.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA= +github.com/valyala/fasthttp v1.28.0 h1:ruVmTmZaBR5i67NqnjvvH5gEv0zwHfWtbjoyW98iho4= +github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/wailsapp/wails/v2 v2.0.0-beta.3 h1:8vhBbnjpYDF6cCUwKadon7J/98UjcP1nrnptUl70Tfg= +github.com/wailsapp/wails/v2 v2.0.0-beta.3/go.mod h1:aku28riyHF2G5jmx/qtxjLWi7VwpTjhhX/HVLCptWFA= +github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28= +github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20= +github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/ztrue/tracerr v0.3.0/go.mod h1:qEalzze4VN9O8tnhBXScfCrmoJo10o8TN5ciKjm6Mww= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= +golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/main.go.tmpl b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/main.go.tmpl new file mode 100644 index 000000000..fc96ccb4e --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/main.go.tmpl @@ -0,0 +1,83 @@ +package main + +import ( + "embed" + "log" + + "github.com/wailsapp/wails/v2/pkg/options/mac" + + "github.com/wailsapp/wails/v2" + "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/pkg/options" + "github.com/wailsapp/wails/v2/pkg/options/windows" +) + +//go:embed frontend/src +var assets embed.FS + +//go:embed build/appicon.png +var icon []byte + +func main() { + // Create an instance of the app structure + app := NewApp() + + // Create application with options + err := wails.Run(&options.App{ + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + MinWidth: 1024, + MinHeight: 768, + MaxWidth: 1280, + MaxHeight: 800, + DisableResize: false, + Fullscreen: false, + Frameless: false, + StartHidden: false, + HideWindowOnClose: false, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + Assets: assets, + Menu: nil, + Logger: nil, + LogLevel: logger.DEBUG, + OnStartup: app.startup, + OnDomReady: app.domReady, + OnBeforeClose: app.beforeClose, + OnShutdown: app.shutdown, + WindowStartState: options.Normal, + Bind: []interface{}{ + app, + }, + // Windows platform specific options + Windows: &windows.Options{ + WebviewIsTransparent: false, + WindowIsTranslucent: false, + DisableWindowIcon: false, + // DisableFramelessWindowDecorations: false, + WebviewUserDataPath: "", + }, + Mac: &mac.Options{ + TitleBar: &mac.TitleBar{ + TitlebarAppearsTransparent: true, + HideTitle: false, + HideTitleBar: false, + FullSizeContent: false, + UseToolbar: false, + HideToolbarSeparator: true, + }, + Appearance: mac.NSAppearanceNameDarkAqua, + WebviewIsTransparent: true, + WindowIsTranslucent: true, + About: &mac.AboutInfo{ + Title: "Plain Template", + Message: "Part of the Wails projects", + Icon: icon, + }, + }, + }) + + if err != nil { + log.Fatal(err) + } +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/template.json b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/template.json new file mode 100644 index 000000000..fc919bc3b --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/template.json @@ -0,0 +1,7 @@ +{ + "name": "Plain HTML/JS/CSS", + "shortname": "plain", + "author": "Lea Anthony ", + "description": "A simple template using only HTML/CSS/JS", + "helpurl": "https://github.com/wailsapp/wails" +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/wails.tmpl.json b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/wails.tmpl.json new file mode 100644 index 000000000..b010f3203 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/wails.tmpl.json @@ -0,0 +1,9 @@ +{ + "name": "{{.ProjectName}}", + "outputfilename": "{{.BinaryName}}", + "wailsjsdir": "./frontend", + "author": { + "name": "{{.AuthorName}}", + "email": "{{.AuthorEmail}}" + } +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json index 530831088..0a5437c9e 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json @@ -8,8 +8,7 @@ "mode": "exec", "program": "${workspaceFolder}/{{.PathToDesktopBinary}}", "preLaunchTask": "build", - "cwd": "${workspaceFolder}", - "env": {} + "cwd": "${workspaceFolder}" }, { "name": "Wails: Debug {{.ProjectName}}", @@ -18,8 +17,16 @@ "mode": "exec", "program": "${workspaceFolder}/{{.PathToDesktopBinary}}", "preLaunchTask": "build debug", - "cwd": "${workspaceFolder}", - "env": {} + "cwd": "${workspaceFolder}" + }, + { + "name": "Wails: Dev {{.ProjectName}}", + "type": "go", + "request": "launch", + "mode": "exec", + "program": "${workspaceFolder}/{{.PathToDesktopBinary}}", + "preLaunchTask": "build dev", + "cwd": "${workspaceFolder}" } ] } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json index a085ec3a9..fdf1d48dd 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.tmpl.json @@ -5,7 +5,25 @@ "label": "build", "type": "shell", "options": { - "cwd": "${workspaceFolder}" + "cwd": "${workspaceFolder}", + "env": { + "CGO_ENABLED": "1" + } + }, + "osx": { + "options": { + "env": { + "CGO_CFLAGS": "-mmacosx-version-min=10.13", + "CGO_LDFLAGS": "-framework UniformTypeIdentifiers -mmacosx-version-min=10.13" + } + } + }, + "windows": { + "options": { + "env": { + "CGO_ENABLED": "0" + } + } }, "command": "go", "args": [ @@ -22,7 +40,25 @@ "label": "build debug", "type": "shell", "options": { - "cwd": "${workspaceFolder}" + "cwd": "${workspaceFolder}", + "env": { + "CGO_ENABLED": "1" + } + }, + "osx": { + "options": { + "env": { + "CGO_CFLAGS": "-mmacosx-version-min=10.13", + "CGO_LDFLAGS": "-framework UniformTypeIdentifiers -mmacosx-version-min=10.13" + } + } + }, + "windows": { + "options": { + "env": { + "CGO_ENABLED": "0" + } + } }, "command": "go", "args": [ @@ -34,6 +70,41 @@ "-o", "{{.PathToDesktopBinary}}" ] + }, + { + "label": "build dev", + "type": "shell", + "options": { + "cwd": "${workspaceFolder}", + "env": { + "CGO_ENABLED": "1" + } + }, + "osx": { + "options": { + "env": { + "CGO_CFLAGS": "-mmacosx-version-min=10.13", + "CGO_LDFLAGS": "-framework UniformTypeIdentifiers -mmacosx-version-min=10.13" + } + } + }, + "windows": { + "options": { + "env": { + "CGO_ENABLED": "0" + } + } + }, + "command": "go", + "args": [ + "build", + "-tags", + "dev", + "-gcflags", + "all=-N -l", + "-o", + "{{.PathToDesktopBinary}}" + ] } ] } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/package.json index f51a554cf..e4567f274 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/package.json @@ -19,7 +19,7 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.9.5", + "vite": "^2.9.9", "typescript": "^4.5.4" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/src/my-element.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/src/my-element.ts index fc5ebbbed..1b313b759 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/src/my-element.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/src/my-element.ts @@ -68,32 +68,31 @@ export class MyElement extends LitElement { } ` -} -@property() -resultText = "Please enter your name below 👇" + @property() + resultText = "Please enter your name below 👇" -greet() -{ - let thisName = this.shadowRoot.getElementById('name').value - Greet(thisName).then(result => { - this.resultText = result - }); -} + greet() { + let thisName = (this.shadowRoot.getElementById('name') as HTMLInputElement)?.value; + if (thisName) { + Greet(thisName).then(result => { + this.resultText = result + }); + } + } -render() -{ - return html` -
- -
${this.resultText}
-
- - -
-
- ` -} + render() { + return html` +
+ +
${this.resultText}
+
+ + +
+
+ ` + } } declare global { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit-ts/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/package.json index 9ddc2e9f4..cb172cb12 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/package.json @@ -17,6 +17,6 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/lit/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/.gitignore b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/.gitignore new file mode 100644 index 000000000..b92a6f8bf --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/.gitignore @@ -0,0 +1,12 @@ +# Wails bin directory +build/bin +# Wails Windows NSIS support files +build/windows/installer/wails_tools.nsh +build/windows/installer/tmp/ + +# IDEs +.idea +.vscode + +# The black hole that is... +node_modules diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/README.md b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/README.md new file mode 100644 index 000000000..9fcd85bdd --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/README.md @@ -0,0 +1,18 @@ +# README + +## About + +This template uses plain JS / HTML and CSS. + +You can configure the project by editing `wails.json`. More information about the project settings can be found +here: https://wails.io/docs/reference/project-config + +## Live Development + +To run in live development mode, run `wails dev` in the project directory. The frontend dev server will run +on http://localhost:34115. Open this in your browser to connect to your application. + +## Building + +For a production build, use `wails build`. + diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/app.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/app.go new file mode 100644 index 000000000..224be7156 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/app.go @@ -0,0 +1,44 @@ +package main + +import ( + "context" + "fmt" +) + +// App struct +type App struct { + ctx context.Context +} + +// NewApp creates a new App application struct +func NewApp() *App { + return &App{} +} + +// startup is called at application startup +func (a *App) startup(ctx context.Context) { + // Perform your setup here + a.ctx = ctx +} + +// domReady is called after front-end resources have been loaded +func (a App) domReady(ctx context.Context) { + // Add your action here +} + +// beforeClose is called when the application is about to quit, +// either by clicking the window close button or calling runtime.Quit. +// Returning true will cause the application to continue, false will continue shutdown as normal. +func (a *App) beforeClose(ctx context.Context) (prevent bool) { + return false +} + +// shutdown is called at application termination +func (a *App) shutdown(ctx context.Context) { + // Perform your teardown here +} + +// Greet returns a greeting for the given name +func (a *App) Greet(name string) string { + return fmt.Sprintf("Hello %s, It's show time!", name) +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/fonts/OFL.txt b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/fonts/OFL.txt new file mode 100644 index 000000000..9cac04ce8 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com), + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/fonts/nunito-v16-latin-regular.woff2 b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/fonts/nunito-v16-latin-regular.woff2 new file mode 100644 index 000000000..2f9cc5964 Binary files /dev/null and b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/fonts/nunito-v16-latin-regular.woff2 differ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/images/logo-universal.png b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/images/logo-universal.png new file mode 100644 index 000000000..be568b847 Binary files /dev/null and b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/assets/images/logo-universal.png differ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/index.tmpl.html b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/index.tmpl.html new file mode 100644 index 000000000..a8a434a37 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/index.tmpl.html @@ -0,0 +1,21 @@ + + + + + + {{.ProjectName}} + + + + +
+ +
Please enter your name below 👇
+
+ + +
+
+ + + diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/main.css b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/main.css new file mode 100644 index 000000000..dab87d09a --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/main.css @@ -0,0 +1,82 @@ +html { + background-color: rgba(27, 38, 54, 1); + text-align: center; + color: white; +} + +body { + margin: 0; + color: white; + font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", + "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", + sans-serif; +} + +@font-face { + font-family: "Nunito"; + font-style: normal; + font-weight: 400; + src: local(""), + url("assets/fonts/nunito-v16-latin-regular.woff2") format("woff2"); +} + +#app { + height: 100vh; + text-align: center; +} + +.logo { + display: block; + width: 50%; + height: 50%; + margin: auto; + padding: 10% 0 0; + background-position: center; + background-repeat: no-repeat; + background-image: url("./assets/images/logo-universal.png"); + background-size: 100% 100%; + background-origin: content-box; +} + +.result { + height: 20px; + line-height: 20px; + margin: 1.5rem auto; +} + +.input-box .btn { + width: 60px; + height: 30px; + line-height: 30px; + border-radius: 3px; + border: none; + margin: 0 0 0 20px; + padding: 0 8px; + cursor: pointer; +} + +.input-box .btn:hover { + background-image: linear-gradient(to top, #cfd9df 0%, #e2ebf0 100%); + color: #333333; +} + +.input-box .input { + border: none; + border-radius: 3px; + outline: none; + height: 30px; + line-height: 30px; + padding: 0 10px; + background-color: rgba(240, 240, 240, 1); + -webkit-font-smoothing: antialiased; +} + +.input-box .input:hover { + border: none; + background-color: rgba(255, 255, 255, 1); +} + +.input-box .input:focus { + border: none; + background-color: rgba(255, 255, 255, 1); +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/main.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/main.js new file mode 100644 index 000000000..3346d59ff --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/frontend/src/main.js @@ -0,0 +1,32 @@ +// Get input + focus +let nameElement = document.getElementById("name"); +nameElement.focus(); + +// Setup the greet function +window.greet = function () { + // Get name + let name = nameElement.value; + + // Check if the input is empty + if (name === "") return; + + // Call App.Greet(name) + try { + window.go.main.App.Greet(name) + .then((result) => { + // Update result with data back from App.Greet() + document.getElementById("result").innerText = result; + }) + .catch((err) => { + console.error(err); + }); + } catch (err) { + console.error(err); + } +}; + +nameElement.onkeydown = function (e) { + if (e.keyCode == 13) { + window.greet(); + } +}; diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/go.mod.tmpl b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/go.mod.tmpl new file mode 100644 index 000000000..27a2d22f4 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/go.mod.tmpl @@ -0,0 +1,34 @@ +module changeme + +go 1.17 + +require github.com/wailsapp/wails/v2 {{.WailsVersion}} + +require ( +github.com/andybalholm/brotli v1.0.2 // indirect +github.com/davecgh/go-spew v1.1.1 // indirect +github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect +github.com/wailsapp/mimetype v1.4.1-beta.1 +github.com/go-ole/go-ole v1.2.5 // indirect +github.com/gofiber/fiber/v2 v2.17.0 // indirect +github.com/gofiber/websocket/v2 v2.0.8 // indirect +github.com/google/uuid v1.1.2 // indirect +github.com/imdario/mergo v0.3.12 // indirect +github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 // indirect +github.com/klauspost/compress v1.12.2 // indirect +github.com/leaanthony/debme v1.2.1 // indirect +github.com/leaanthony/go-ansi-parser v1.0.1 // indirect +github.com/leaanthony/slicer v1.5.0 // indirect +github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect +github.com/pkg/errors v0.9.1 // indirect +github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect +github.com/tkrajina/go-reflector v0.5.5 // indirect +github.com/valyala/bytebufferpool v1.0.0 // indirect +github.com/valyala/fasthttp v1.28.0 // indirect +github.com/valyala/tcplisten v1.0.0 // indirect +golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect +) + +// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/go.sum b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/go.sum new file mode 100644 index 000000000..3e14e745f --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/go.sum @@ -0,0 +1,220 @@ +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E= +github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab h1:9e2joQGp642wHGFP5m86SDptAavrdGBe8/x9DGEEAaI= +github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab/go.mod h1:smsv/h4PBEBaU0XDTY5UwJTpZv69fQ0FfcLJr21mA6Y= +github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/flytam/filenamify v1.0.0/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/wailsapp/mimetype v1.4.1-beta.1 h1:gSnKX7WH+7aA0EEjOGUmpWXTb0Nt5B7/8Dm9wHLrnnY= +github.com/wailsapp/mimetype v1.4.1-beta.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw= +github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= +github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= +github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gofiber/fiber/v2 v2.17.0 h1:qP3PkGUbBB0i9iQh5E057XI1yO5CZigUxZhyUFYAFoM= +github.com/gofiber/fiber/v2 v2.17.0/go.mod h1:iftruuHGkRYGEXVISmdD7HTYWyfS2Bh+Dkfq4n/1Owg= +github.com/gofiber/websocket/v2 v2.0.8 h1:Hb4y6IxYZVMO0segROODXJiXVgVD3a6i7wnfot8kM6k= +github.com/gofiber/websocket/v2 v2.0.8/go.mod h1:fv8HSGQX09sauNv9g5Xq8GeGAaahLFYQKKb4ZdT0x2w= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= +github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck= +github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= +github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.12.2 h1:2KCfW3I9M7nSc5wOqXAlW2v2U6v+w6cbjvbfp+OykW8= +github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0= +github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc= +github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA= +github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4= +github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM= +github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4= +github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA= +github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY= +github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY= +github.com/leaanthony/typescriptify-golang-structs v0.1.7 h1:yoznzWzyxkO/iWdlpq+aPcuJ5Y/hpjq/lmgMFmpjwl0= +github.com/leaanthony/typescriptify-golang-structs v0.1.7/go.mod h1:cWtOkiVhMF77e6phAXUcfNwYmMwCJ67Sij24lfvi9Js= +github.com/leaanthony/winicon v1.0.0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= +github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 h1:acNfDZXmm28D2Yg/c3ALnZStzNaZMSagpbr96vY6Zjc= +github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f h1:PgA+Olipyj258EIEYnpFFONrrCcAIWNUNoFhUfMqAGY= +github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f/go.mod h1:lHhJedqxCoHN+zMtwGNTXWmF0u9Jt363FYRhV6g0CdY= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tc-hib/winres v0.1.5/go.mod h1:pe6dOR40VOrGz8PkzreVKNvEKnlE8t4yR8A8naL+t7A= +github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs= +github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ= +github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk= +github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tidwall/sjson v1.1.7/go.mod h1:w/yG+ezBeTdUxiKs5NcPicO9diP38nk96QBAbIIGeFs= +github.com/tkrajina/go-reflector v0.5.5 h1:gwoQFNye30Kk7NrExj8zm3zFtrGPqOkzFMLuQZg1DtQ= +github.com/tkrajina/go-reflector v0.5.5/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.9.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasthttp v1.26.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA= +github.com/valyala/fasthttp v1.28.0 h1:ruVmTmZaBR5i67NqnjvvH5gEv0zwHfWtbjoyW98iho4= +github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/wailsapp/wails/v2 v2.0.0-beta.3 h1:8vhBbnjpYDF6cCUwKadon7J/98UjcP1nrnptUl70Tfg= +github.com/wailsapp/wails/v2 v2.0.0-beta.3/go.mod h1:aku28riyHF2G5jmx/qtxjLWi7VwpTjhhX/HVLCptWFA= +github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28= +github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20= +github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/ztrue/tracerr v0.3.0/go.mod h1:qEalzze4VN9O8tnhBXScfCrmoJo10o8TN5ciKjm6Mww= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= +golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/main.tmpl.go new file mode 100644 index 000000000..fc96ccb4e --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/main.tmpl.go @@ -0,0 +1,83 @@ +package main + +import ( + "embed" + "log" + + "github.com/wailsapp/wails/v2/pkg/options/mac" + + "github.com/wailsapp/wails/v2" + "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/pkg/options" + "github.com/wailsapp/wails/v2/pkg/options/windows" +) + +//go:embed frontend/src +var assets embed.FS + +//go:embed build/appicon.png +var icon []byte + +func main() { + // Create an instance of the app structure + app := NewApp() + + // Create application with options + err := wails.Run(&options.App{ + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + MinWidth: 1024, + MinHeight: 768, + MaxWidth: 1280, + MaxHeight: 800, + DisableResize: false, + Fullscreen: false, + Frameless: false, + StartHidden: false, + HideWindowOnClose: false, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + Assets: assets, + Menu: nil, + Logger: nil, + LogLevel: logger.DEBUG, + OnStartup: app.startup, + OnDomReady: app.domReady, + OnBeforeClose: app.beforeClose, + OnShutdown: app.shutdown, + WindowStartState: options.Normal, + Bind: []interface{}{ + app, + }, + // Windows platform specific options + Windows: &windows.Options{ + WebviewIsTransparent: false, + WindowIsTranslucent: false, + DisableWindowIcon: false, + // DisableFramelessWindowDecorations: false, + WebviewUserDataPath: "", + }, + Mac: &mac.Options{ + TitleBar: &mac.TitleBar{ + TitlebarAppearsTransparent: true, + HideTitle: false, + HideTitleBar: false, + FullSizeContent: false, + UseToolbar: false, + HideToolbarSeparator: true, + }, + Appearance: mac.NSAppearanceNameDarkAqua, + WebviewIsTransparent: true, + WindowIsTranslucent: true, + About: &mac.AboutInfo{ + Title: "Plain Template", + Message: "Part of the Wails projects", + Icon: icon, + }, + }, + }) + + if err != nil { + log.Fatal(err) + } +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/template.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/template.json new file mode 100644 index 000000000..fc919bc3b --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/template.json @@ -0,0 +1,7 @@ +{ + "name": "Plain HTML/JS/CSS", + "shortname": "plain", + "author": "Lea Anthony ", + "description": "A simple template using only HTML/CSS/JS", + "helpurl": "https://github.com/wailsapp/wails" +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/wails.tmpl.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/wails.tmpl.json new file mode 100644 index 000000000..b010f3203 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/plain/wails.tmpl.json @@ -0,0 +1,9 @@ +{ + "name": "{{.ProjectName}}", + "outputfilename": "{{.BinaryName}}", + "wailsjsdir": "./frontend", + "author": { + "name": "{{.AuthorName}}", + "email": "{{.AuthorEmail}}" + } +} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/package.json index 10ea6e6d3..7170ceb88 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/package.json @@ -13,6 +13,6 @@ "devDependencies": { "@preact/preset-vite": "^2.1.5", "typescript": "^4.5.4", - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/app.tsx b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/app.tsx index bffcb461c..05d7c32d0 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/app.tsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/app.tsx @@ -19,7 +19,7 @@ export function App(props: any) {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/preact.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/preact.d.ts index ac79d62a4..e69de29bb 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/preact.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/src/preact.d.ts @@ -1 +0,0 @@ -import JSX = preact.JSX diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/vite.config.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/vite.config.ts index e3bdaffe8..25845ba4b 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/vite.config.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/vite.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'vite' +import {defineConfig} from 'vite' import preact from '@preact/preset-vite' // https://vitejs.dev/config/ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact-ts/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/package.json index 9c4bd75c5..0908feee0 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/package.json @@ -12,6 +12,6 @@ }, "devDependencies": { "@preact/preset-vite": "^2.1.5", - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/app.jsx b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/app.jsx index a50cfd089..1ada97ac4 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/app.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/app.jsx @@ -19,7 +19,7 @@ export function App(props) {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/main.jsx b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/main.jsx index 41787dabc..e50e105db 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/main.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/main.jsx @@ -1,5 +1,14 @@ -import {render} from 'preact'; -import {App} from './app'; -import './style.css'; +import React from 'react' +import {createRoot} from 'react-dom/client' +import './style.css' +import App from './App' -render(, document.getElementById('app')); +const container = document.getElementById('root') + +const root = createRoot(container) + +root.render( + + + +) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/vite.config.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/vite.config.js index e3bdaffe8..25845ba4b 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/vite.config.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/vite.config.js @@ -1,4 +1,4 @@ -import { defineConfig } from 'vite' +import {defineConfig} from 'vite' import preact from '@preact/preset-vite' // https://vitejs.dev/config/ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/package.json index 8be3b8099..d465e2c1e 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/package.json @@ -16,6 +16,6 @@ "@types/react-dom": "^18.0.0", "@vitejs/plugin-react": "^1.3.0", "typescript": "^4.6.3", - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/App.tsx b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/App.tsx index 7895c66cf..a6e56f9f8 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/App.tsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/App.tsx @@ -18,7 +18,7 @@ function App() {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/main.tsx b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/main.tsx index a6c27f6a8..361c8d660 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/main.tsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/src/main.tsx @@ -1,11 +1,14 @@ import React from 'react' -import ReactDOM from 'react-dom' +import { createRoot } from 'react-dom/client' import './style.css' import App from './App' -ReactDOM.render( - - - , - document.getElementById('root') +const container = document.getElementById('root') + +const root = createRoot(container!) + +root.render( + + + ) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/vite.config.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/vite.config.ts index b1b5f91e5..49550655a 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/vite.config.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/vite.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'vite' +import {defineConfig} from 'vite' import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react-ts/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/package.json index 6ccd4766f..3c1470704 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/package.json @@ -15,6 +15,6 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "@vitejs/plugin-react": "^1.3.0", - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/App.jsx b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/App.jsx index 071423476..fd762291f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/App.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/App.jsx @@ -18,7 +18,7 @@ function App() {
{resultText}
- +
diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/main.jsx b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/main.jsx index a6c27f6a8..e50e105db 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/main.jsx +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/src/main.jsx @@ -1,11 +1,14 @@ import React from 'react' -import ReactDOM from 'react-dom' +import {createRoot} from 'react-dom/client' import './style.css' import App from './App' -ReactDOM.render( +const container = document.getElementById('root') + +const root = createRoot(container) + +root.render( - , - document.getElementById('root') + ) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/vite.config.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/vite.config.js index b1b5f91e5..49550655a 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/vite.config.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/vite.config.js @@ -1,4 +1,4 @@ -import { defineConfig } from 'vite' +import {defineConfig} from 'vite' import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/react/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/package.json index 7fb9aecdc..955eb00da 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/package.json @@ -17,6 +17,6 @@ "svelte-preprocess": "^4.9.8", "tslib": "^2.3.1", "typescript": "^4.5.4", - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/vite.config.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/vite.config.ts index 401b4d4bd..d37616f9a 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/vite.config.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/vite.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import {defineConfig} from 'vite' +import {svelte} from '@sveltejs/vite-plugin-svelte' // https://vitejs.dev/config/ export default defineConfig({ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/package.json index c14404abd..890133352 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/package.json @@ -11,6 +11,6 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30", "svelte": "^3.44.0", - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/vite.config.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/vite.config.js index 401b4d4bd..d37616f9a 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/vite.config.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/vite.config.js @@ -1,5 +1,5 @@ -import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import {defineConfig} from 'vite' +import {svelte} from '@sveltejs/vite-plugin-svelte' // https://vitejs.dev/config/ export default defineConfig({ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/package.json index 7cf9f3e21..37305b4c0 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/package.json @@ -9,6 +9,6 @@ }, "devDependencies": { "typescript": "^4.5.4", - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla-ts/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/package.json index b1420743b..4ac881798 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/package.json @@ -8,6 +8,6 @@ "preview": "vite preview" }, "devDependencies": { - "vite": "^2.9.5" + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/.vscode/extensions.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/.vscode/extensions.json index 3dc5b08bc..57011895d 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/.vscode/extensions.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/.vscode/extensions.json @@ -1,3 +1,5 @@ { - "recommendations": ["johnsoncodehk.volar"] + "recommendations": [ + "Vue.volar" + ] } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/README.md b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/README.md index e43251672..30b15e215 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/README.md +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/README.md @@ -4,7 +4,7 @@ This template should help get you started developing with Vue 3 and TypeScript i ## Recommended IDE Setup -- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar) +- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) ## Type Support For `.vue` Imports in TS diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/package.json index 20f61c514..62c7fd6e1 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/package.json @@ -11,10 +11,9 @@ "vue": "^3.2.25" }, "devDependencies": { - "@vitejs/plugin-vue": "^2.3.1", + "@vitejs/plugin-vue": "^2.3.3", "typescript": "^4.5.4", - "vite": "^2.9.5", - "vue-tsc": "^0.34.7", - "@babel/types": "^7.17.10" + "vite": "^2.9.9", + "vue-tsc": "^0.34.7" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/src/env.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/src/env.d.ts index aafef9509..d0c7971d7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/src/env.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/src/env.d.ts @@ -1,8 +1,8 @@ /// declare module '*.vue' { - import type { DefineComponent } from 'vue' - // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types - const component: DefineComponent<{}, {}, any> - export default component + import type {DefineComponent} from 'vue' + // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types + const component: DefineComponent<{}, {}, any> + export default component } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/vite.config.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/vite.config.ts index 315212d69..a30c338ed 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/vite.config.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/vite.config.ts @@ -1,4 +1,4 @@ -import { defineConfig } from 'vite' +import {defineConfig} from 'vite' import vue from '@vitejs/plugin-vue' // https://vitejs.dev/config/ diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/.vscode/extensions.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/.vscode/extensions.json index 3dc5b08bc..57011895d 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/.vscode/extensions.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/.vscode/extensions.json @@ -1,3 +1,5 @@ { - "recommendations": ["johnsoncodehk.volar"] + "recommendations": [ + "Vue.volar" + ] } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/README.md b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/README.md index eea15cef4..02124a7a0 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/README.md +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/README.md @@ -4,4 +4,4 @@ This template should help get you started developing with Vue 3 in Vite. The tem ## Recommended IDE Setup -- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar) +- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/package.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/package.json index c0f982635..d171757c8 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/package.json +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/package.json @@ -11,7 +11,7 @@ "vue": "^3.2.25" }, "devDependencies": { - "@vitejs/plugin-vue": "^2.3.1", - "vite": "^2.9.5" + "@vitejs/plugin-vue": "^2.3.3", + "vite": "^2.9.9" } } \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.d.ts b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.d.ts index bcacbec00..8d816307f 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.d.ts +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.d.ts @@ -167,9 +167,9 @@ export function WindowMinimise(): void; // Restores the window to the dimensions and position prior to minimising. export function WindowUnminimise(): void; -// [WindowSetRGBA](https://wails.io/docs/reference/runtime/window#windowsetrgba) +// [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetRGBA(R: number, G: number, B: number, A: number): void; +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. @@ -177,7 +177,7 @@ export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): EnvironmentInfo; +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/frontend/wailsjs/runtime/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go index c60affe67..feeeaa186 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue/main.tmpl.go @@ -16,11 +16,12 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", - Width: 1024, - Height: 768, - Assets: assets, - OnStartup: app.startup, + Title: "{{.ProjectName}}", + Width: 1024, + Height: 768, + Assets: assets, + BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, + OnStartup: app.startup, Bind: []interface{}{ app, }, diff --git a/v2/cmd/wails/internal/commands/update/update.go b/v2/cmd/wails/internal/commands/update/update.go index 5eef6af25..8539d1b19 100644 --- a/v2/cmd/wails/internal/commands/update/update.go +++ b/v2/cmd/wails/internal/commands/update/update.go @@ -55,6 +55,12 @@ func AddSubcommand(app *clir.Cli, w io.Writer, currentVersion string) error { desiredVersion, err = github.GetLatestPreRelease() } else { desiredVersion, err = github.GetLatestStableRelease() + if err != nil { + println("") + println("No stable release found for this major version. To update to the latest pre-release (eg beta), run:") + println(" wails update -pre") + return nil + } } } if err != nil { diff --git a/v2/cmd/wails/internal/version.go b/v2/cmd/wails/internal/version.go index f1c511852..cfc37182c 100644 --- a/v2/cmd/wails/internal/version.go +++ b/v2/cmd/wails/internal/version.go @@ -1,3 +1,6 @@ package internal -var Version = "v2.0.0-beta.36" +import _ "embed" + +//go:embed version.txt +var Version string diff --git a/v2/cmd/wails/internal/version.txt b/v2/cmd/wails/internal/version.txt new file mode 100644 index 000000000..7bdae6b2a --- /dev/null +++ b/v2/cmd/wails/internal/version.txt @@ -0,0 +1 @@ +v2.0.0-beta.38 \ No newline at end of file diff --git a/v2/cmd/wails/main.go b/v2/cmd/wails/main.go index e69db18d7..dd7219fb5 100644 --- a/v2/cmd/wails/main.go +++ b/v2/cmd/wails/main.go @@ -23,7 +23,7 @@ func fatal(message string) { } func banner(_ *clir.Cli) string { - return fmt.Sprintf("%s %s\n", + return fmt.Sprintf("%s %s", colour.Yellow("Wails CLI"), colour.DarkRed(internal.Version)) } diff --git a/v2/go.mod b/v2/go.mod index 5e3f0c2a8..2d227c31f 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -9,7 +9,7 @@ require ( github.com/go-git/go-billy/v5 v5.2.0 // indirect github.com/go-git/go-git/v5 v5.3.0 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 - github.com/google/uuid v1.1.2 // indirect + github.com/google/uuid v1.1.2 github.com/imdario/mergo v0.3.12 github.com/jackmordaunt/icns v1.0.0 github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e @@ -17,7 +17,6 @@ require ( github.com/leaanthony/clir v1.0.4 github.com/leaanthony/debme v1.2.1 github.com/leaanthony/go-ansi-parser v1.0.1 - github.com/leaanthony/go-common-file-dialog v1.0.3 github.com/leaanthony/gosod v1.0.3 github.com/leaanthony/idgen v1.0.0 github.com/leaanthony/slicer v1.5.0 @@ -38,14 +37,17 @@ require ( golang.org/x/tools v0.1.0 ) -require github.com/bitfield/script v0.19.0 +require ( + github.com/bep/debounce v1.2.1 + github.com/bitfield/script v0.19.0 + github.com/go-ole/go-ole v1.2.6 +) require ( bitbucket.org/creachadair/shell v0.0.7 // indirect github.com/Microsoft/go-winio v0.4.16 // indirect github.com/emirpasic/gods v1.12.0 // indirect github.com/go-git/gcfg v1.5.0 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect github.com/kr/pretty v0.3.0 // indirect diff --git a/v2/go.sum b/v2/go.sum index 14ea32693..b9b91b1b8 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -11,6 +11,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY= +github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= github.com/bitfield/script v0.19.0 h1:W24f+FQuPab9gXcW8bhcbo5qO8AtrXyu3XOnR4zhHN0= github.com/bitfield/script v0.19.0/go.mod h1:ana6F8YOSZ3ImT8SauIzuYSqXgFVkSUJ6kgja+WMmIY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -36,7 +38,6 @@ github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbK github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= github.com/go-git/go-git/v5 v5.3.0 h1:8WKMtJR2j8RntEXR/uvTKagfEt4GYlwQ7mntE4+0GWc= github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw= -github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -46,7 +47,6 @@ github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= @@ -79,8 +79,6 @@ github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oO github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA= github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4= github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM= -github.com/leaanthony/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y= -github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0= github.com/leaanthony/gosod v1.0.3 h1:Fnt+/B6NjQOVuCWOKYRREZnjGyvg+mEhd1nkkA04aTQ= github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4= github.com/leaanthony/idgen v1.0.0 h1:IZreR+JGEzFV4yeVuBZA25gM0keUoFy+RDUldncQ+Jw= diff --git a/v2/internal/appng/app_bindings.go b/v2/internal/appng/app_bindings.go index 477e811c2..8a80da32b 100644 --- a/v2/internal/appng/app_bindings.go +++ b/v2/internal/appng/app_bindings.go @@ -35,6 +35,8 @@ func (a *App) Run() error { return nil } +func (a *App) Shutdown() {} + // CreateApp creates the app! func CreateApp(appoptions *options.App) (*App, error) { // Set up logger diff --git a/v2/internal/appng/app_default_darwin.go b/v2/internal/appng/app_default_darwin.go index fb40af694..9976a2595 100644 --- a/v2/internal/appng/app_default_darwin.go +++ b/v2/internal/appng/app_default_darwin.go @@ -16,6 +16,8 @@ func (a *App) Run() error { return nil } +func (a *App) Shutdown() {} + // CreateApp creates the app! func CreateApp(_ *options.App) (*App, error) { return nil, fmt.Errorf(`Wails applications will not build without the correct build tags.`) diff --git a/v2/internal/appng/app_default_linux.go b/v2/internal/appng/app_default_linux.go index 257230e11..cbd566337 100644 --- a/v2/internal/appng/app_default_linux.go +++ b/v2/internal/appng/app_default_linux.go @@ -16,6 +16,8 @@ func (a *App) Run() error { return nil } +func (a *App) Shutdown() {} + // CreateApp creates the app! func CreateApp(_ *options.App) (*App, error) { return nil, fmt.Errorf(`Wails applications will not build without the correct build tags.`) diff --git a/v2/internal/appng/app_default_windows.go b/v2/internal/appng/app_default_windows.go index cf70cef90..e3388b91f 100644 --- a/v2/internal/appng/app_default_windows.go +++ b/v2/internal/appng/app_default_windows.go @@ -17,6 +17,8 @@ func (a *App) Run() error { return nil } +func (a *App) Shutdown() {} + // CreateApp creates the app! func CreateApp(_ *options.App) (*App, error) { result := w32.MessageBox(0, diff --git a/v2/internal/appng/app_dev.go b/v2/internal/appng/app_dev.go index 71715635a..e71149180 100644 --- a/v2/internal/appng/app_dev.go +++ b/v2/internal/appng/app_dev.go @@ -44,11 +44,16 @@ type App struct { ctx context.Context } -func (a *App) Run() error { - err := a.frontend.Run(a.ctx) +func (a *App) Shutdown() { if a.shutdownCallback != nil { a.shutdownCallback(a.ctx) } + a.frontend.Quit() +} + +func (a *App) Run() error { + err := a.frontend.Run(a.ctx) + a.Shutdown() return err } @@ -63,6 +68,8 @@ func CreateApp(appoptions *options.App) (*App, error) { myLogger.SetLogLevel(appoptions.LogLevel) // Check for CLI Flags + devFlags := flag.NewFlagSet("dev", flag.ContinueOnError) + var assetdirFlag *string var devServerFlag *string var frontendDevServerURLFlag *string @@ -70,25 +77,28 @@ func CreateApp(appoptions *options.App) (*App, error) { assetdir := os.Getenv("assetdir") if assetdir == "" { - assetdirFlag = flag.String("assetdir", "", "Directory to serve assets") + assetdirFlag = devFlags.String("assetdir", "", "Directory to serve assets") } + devServer := os.Getenv("devserver") if devServer == "" { - devServerFlag = flag.String("devserver", "", "Address to bind the wails dev server to") + devServerFlag = devFlags.String("devserver", "", "Address to bind the wails dev server to") } + frontendDevServerURL := os.Getenv("frontenddevserverurl") if frontendDevServerURL == "" { - frontendDevServerURLFlag = flag.String("frontenddevserverurl", "", "URL of the external frontend dev server") + frontendDevServerURLFlag = devFlags.String("frontenddevserverurl", "", "URL of the external frontend dev server") } loglevel := os.Getenv("loglevel") if loglevel == "" { - loglevelFlag = flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error") + loglevelFlag = devFlags.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error") } // If we weren't given the assetdir in the environment variables if assetdir == "" { - flag.Parse() + // Parse args but ignore errors in case -appargs was used to pass in args for the app. + _ = devFlags.Parse(os.Args[1:]) if assetdirFlag != nil { assetdir = *assetdirFlag } diff --git a/v2/internal/appng/app_production.go b/v2/internal/appng/app_production.go index cbbb75d3e..05e205712 100644 --- a/v2/internal/appng/app_production.go +++ b/v2/internal/appng/app_production.go @@ -34,11 +34,16 @@ type App struct { ctx context.Context } -func (a *App) Run() error { - err := a.frontend.Run(a.ctx) +func (a *App) Shutdown() { if a.shutdownCallback != nil { a.shutdownCallback(a.ctx) } + a.frontend.Quit() +} + +func (a *App) Run() error { + err := a.frontend.Run(a.ctx) + a.Shutdown() return err } diff --git a/v2/internal/binding/binding.go b/v2/internal/binding/binding.go index 05b450336..132f4c4a2 100755 --- a/v2/internal/binding/binding.go +++ b/v2/internal/binding/binding.go @@ -152,11 +152,13 @@ func (b *Bindings) AddStructToGenerateTS(packageName string, structName string, for i := 0; i < structType.NumField(); i++ { field := structType.Field(i) if field.Anonymous { - return + continue } - kind := field.Type.Kind() if kind == reflect.Struct { + if field.PkgPath == "" { + continue + } fqname := field.Type.String() sName := strings.Split(fqname, ".")[1] pName := getPackageName(fqname) @@ -166,6 +168,9 @@ func (b *Bindings) AddStructToGenerateTS(packageName string, structName string, b.AddStructToGenerateTS(pName, sName, s) } } else if kind == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct { + if field.PkgPath == "" { + continue + } fqname := field.Type.String() sName := strings.Split(fqname, ".")[1] pName := getPackageName(fqname) diff --git a/v2/internal/binding/generate.go b/v2/internal/binding/generate.go index c1912f3b4..43be5d40c 100644 --- a/v2/internal/binding/generate.go +++ b/v2/internal/binding/generate.go @@ -6,6 +6,7 @@ import ( "fmt" "os" "path/filepath" + "sort" "strings" "github.com/wailsapp/wails/v2/internal/fs" @@ -32,8 +33,17 @@ func (b *Bindings) GenerateGoBindings(baseDir string) error { tsContent.WriteString(`// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT `) + // Sort the method names alphabetically + methodNames := make([]string, 0, len(methods)) + for methodName := range methods { + methodNames = append(methodNames, methodName) + } + sort.Strings(methodNames) + var importNamespaces slicer.StringSlicer - for methodName, methodDetails := range methods { + for _, methodName := range methodNames { + // Get the method details + methodDetails := methods[methodName] // Generate JS var args slicer.StringSlicer @@ -44,11 +54,7 @@ func (b *Bindings) GenerateGoBindings(baseDir string) error { argsString := args.Join(", ") jsoutput.WriteString(fmt.Sprintf("\nexport function %s(%s) {", methodName, argsString)) jsoutput.WriteString("\n") - if methodDetails.OutputCount() == 0 { - jsoutput.WriteString(fmt.Sprintf(" window['go']['%s']['%s']['%s'](%s);", packageName, structName, methodName, argsString)) - } else { - jsoutput.WriteString(fmt.Sprintf(" return window['go']['%s']['%s']['%s'](%s);", packageName, structName, methodName, argsString)) - } + jsoutput.WriteString(fmt.Sprintf(" return window['go']['%s']['%s']['%s'](%s);", packageName, structName, methodName, argsString)) jsoutput.WriteString("\n") jsoutput.WriteString(fmt.Sprintf("}")) jsoutput.WriteString("\n") @@ -104,7 +110,7 @@ func (b *Bindings) GenerateGoBindings(baseDir string) error { func goTypeToJSDocType(input string, importNamespaces *slicer.StringSlicer) string { switch true { - case input == "interface{}": + case input == "interface {}": return "any" case input == "string": return "string" diff --git a/v2/internal/ffenestri/ffenestri_client_windows.go b/v2/internal/ffenestri/ffenestri_client_windows.go index c00c13706..a9a6cf042 100644 --- a/v2/internal/ffenestri/ffenestri_client_windows.go +++ b/v2/internal/ffenestri/ffenestri_client_windows.go @@ -14,7 +14,7 @@ import ( "strconv" "syscall" - "github.com/leaanthony/go-common-file-dialog/cfd" + "github.com/wailsapp/wails/v2/internal/go-common-file-dialog/cfd" "github.com/wailsapp/wails/v2/pkg/runtime" "golang.org/x/sys/windows" diff --git a/v2/internal/frontend/assetserver/assethandler.go b/v2/internal/frontend/assetserver/assethandler.go index c7e4ac455..f30869c88 100644 --- a/v2/internal/frontend/assetserver/assethandler.go +++ b/v2/internal/frontend/assetserver/assethandler.go @@ -11,7 +11,6 @@ import ( "os" "path" "strings" - "time" "github.com/wailsapp/wails/v2/internal/fs" "github.com/wailsapp/wails/v2/internal/logger" @@ -31,10 +30,10 @@ type assetHandler struct { logger *logger.Logger - servingFromDisk bool + retryMissingFiles bool } -func NewAsssetHandler(ctx context.Context, options *options.App) (http.Handler, error) { +func NewAssetHandler(ctx context.Context, options *options.App) (http.Handler, error) { vfs := options.Assets if vfs != nil { if _, err := vfs.Open("."); err != nil { @@ -55,12 +54,6 @@ func NewAsssetHandler(ctx context.Context, options *options.App) (http.Handler, result := &assetHandler{ fs: vfs, handler: options.AssetsHandler, - - // Check if we have been given a directory to serve assets from. - // If so, this means we are in dev mode and are serving assets off disk. - // We indicate this through the `servingFromDisk` flag to ensure requests - // aren't cached in dev mode. - servingFromDisk: ctx.Value("assetdir") != nil, } if _logger := ctx.Value("logger"); _logger != nil { @@ -84,10 +77,16 @@ func (d *assetHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) { if handler != nil { d.logDebug("[AssetHandler] File '%s' not found, serving '%s' by AssetHandler", filename, req.URL) handler.ServeHTTP(rw, req) + err = nil + } else if filename == indexHTML { + err = serveFile(rw, filename, defaultHTML) } else { rw.WriteHeader(http.StatusNotFound) + err = nil } - } else { + } + + if err != nil { d.logError("[AssetHandler] Unable to load file '%s': %s", filename, err) http.Error(rw, err.Error(), http.StatusInternalServerError) } @@ -107,19 +106,7 @@ func (d *assetHandler) serveFSFile(rw http.ResponseWriter, filename string) erro } file, err := d.fs.Open(filename) - if err != nil && d.servingFromDisk { - for tries := 0; tries < 50; tries++ { - file, err = d.fs.Open(filename) - if err != nil { - time.Sleep(100 * time.Millisecond) - } - } - } - if err != nil { - if filename == indexHTML && os.IsNotExist(err) { - return serveFile(rw, filename, defaultHTML) - } return err } defer file.Close() diff --git a/v2/internal/frontend/assetserver/assetserver.go b/v2/internal/frontend/assetserver/assetserver.go index 47aa6eb33..fa3f1ed99 100644 --- a/v2/internal/frontend/assetserver/assetserver.go +++ b/v2/internal/frontend/assetserver/assetserver.go @@ -32,7 +32,7 @@ type AssetServer struct { } func NewAssetServer(ctx context.Context, options *options.App, bindingsJSON string) (*AssetServer, error) { - handler, err := NewAsssetHandler(ctx, options) + handler, err := NewAssetHandler(ctx, options) if err != nil { return nil, err } diff --git a/v2/internal/frontend/desktop/darwin/Application.h b/v2/internal/frontend/desktop/darwin/Application.h index 10a3aa638..bebaf84f3 100644 --- a/v2/internal/frontend/desktop/darwin/Application.h +++ b/v2/internal/frontend/desktop/darwin/Application.h @@ -23,6 +23,7 @@ void Run(void *inctx, const char* url, int activationPolicy); void SetTitle(void* ctx, const char *title); void Center(void* ctx); void SetSize(void* ctx, int width, int height); +void SetAlwaysOnTop(void* ctx, int onTop); void SetMinSize(void* ctx, int width, int height); void SetMaxSize(void* ctx, int width, int height); void SetPosition(void* ctx, int x, int y); @@ -35,7 +36,7 @@ void Maximise(void* ctx); void UnMaximise(void* ctx); void Hide(void* ctx); void Show(void* ctx); -void SetRGBA(void* ctx, int r, int g, int b, int a); +void SetBackgroundColour(void* ctx, int r, int g, int b, int a); void ExecJS(void* ctx, const char*); void Quit(void*); diff --git a/v2/internal/frontend/desktop/darwin/Application.m b/v2/internal/frontend/desktop/darwin/Application.m index cd67014c5..22095d23a 100644 --- a/v2/internal/frontend/desktop/darwin/Application.m +++ b/v2/internal/frontend/desktop/darwin/Application.m @@ -82,10 +82,10 @@ void SetTitle(void* inctx, const char *title) { } -void SetRGBA(void *inctx, int r, int g, int b, int a) { +void SetBackgroundColour(void *inctx, int r, int g, int b, int a) { WailsContext *ctx = (__bridge WailsContext*) inctx; ON_MAIN_THREAD( - [ctx SetRGBA:r :g :b :a]; + [ctx SetBackgroundColour:r :g :b :a]; ); } @@ -96,6 +96,13 @@ void SetSize(void* inctx, int width, int height) { ); } +void SetAlwaysOnTop(void* inctx, int onTop) { + WailsContext *ctx = (__bridge WailsContext*) inctx; + ON_MAIN_THREAD( + [ctx SetAlwaysOnTop:onTop]; + ); +} + void SetMinSize(void* inctx, int width, int height) { WailsContext *ctx = (__bridge WailsContext*) inctx; ON_MAIN_THREAD( diff --git a/v2/internal/frontend/desktop/darwin/WailsContext.h b/v2/internal/frontend/desktop/darwin/WailsContext.h index f4b4ca848..9b9e6103b 100644 --- a/v2/internal/frontend/desktop/darwin/WailsContext.h +++ b/v2/internal/frontend/desktop/darwin/WailsContext.h @@ -62,6 +62,7 @@ - (void) SetMinSize:(int)minWidth :(int)minHeight; - (void) SetMaxSize:(int)maxWidth :(int)maxHeight; - (void) SetTitle:(NSString*)title; +- (void) SetAlwaysOnTop:(int)onTop; - (void) Center; - (void) Fullscreen; - (void) UnFullscreen; @@ -70,7 +71,7 @@ - (void) Maximise; - (void) ToggleMaximise; - (void) UnMaximise; -- (void) SetRGBA:(int)r :(int)g :(int)b :(int)a; +- (void) SetBackgroundColour:(int)r :(int)g :(int)b :(int)a; - (void) HideMouse; - (void) ShowMouse; - (void) Hide; diff --git a/v2/internal/frontend/desktop/darwin/WailsContext.m b/v2/internal/frontend/desktop/darwin/WailsContext.m index 8abc2ca30..cc92902e0 100644 --- a/v2/internal/frontend/desktop/darwin/WailsContext.m +++ b/v2/internal/frontend/desktop/darwin/WailsContext.m @@ -299,7 +299,7 @@ [self.webview loadRequest:wkRequest]; } -- (void) SetRGBA:(int)r :(int)g :(int)b :(int)a { +- (void) SetBackgroundColour:(int)r :(int)g :(int)b :(int)a { float red = r/255.0; float green = g/255.0; float blue = b/255.0; @@ -372,6 +372,14 @@ } } +- (void) SetAlwaysOnTop:(int)onTop { + if (onTop) { + [self.mainWindow setLevel:NSStatusWindowLevel]; + } else { + [self.mainWindow setLevel:NSNormalWindowLevel]; + } +} + - (void) ExecJS:(NSString*)script { [self.webview evaluateJavaScript:script completionHandler:nil]; } diff --git a/v2/internal/frontend/desktop/darwin/frontend.go b/v2/internal/frontend/desktop/darwin/frontend.go index 3024ac737..b37815b9e 100644 --- a/v2/internal/frontend/desktop/darwin/frontend.go +++ b/v2/internal/frontend/desktop/darwin/frontend.go @@ -189,6 +189,9 @@ func (f *Frontend) Run(ctx context.Context) error { func (f *Frontend) WindowCenter() { f.mainWindow.Center() } +func (f *Frontend) WindowSetAlwaysOnTop(onTop bool) { + f.mainWindow.SetAlwaysOnTop(onTop) +} func (f *Frontend) WindowSetPosition(x, y int) { f.mainWindow.SetPosition(x, y) @@ -247,11 +250,11 @@ func (f *Frontend) WindowSetMaxSize(width int, height int) { f.mainWindow.SetMaxSize(width, height) } -func (f *Frontend) WindowSetRGBA(col *options.RGBA) { +func (f *Frontend) WindowSetBackgroundColour(col *options.RGBA) { if col == nil { return } - f.mainWindow.SetRGBA(col.R, col.G, col.B, col.A) + f.mainWindow.SetBackgroundColour(col.R, col.G, col.B, col.A) } func (f *Frontend) Quit() { diff --git a/v2/internal/frontend/desktop/darwin/main.m b/v2/internal/frontend/desktop/darwin/main.m index f7b0f62f0..154c33065 100644 --- a/v2/internal/frontend/desktop/darwin/main.m +++ b/v2/internal/frontend/desktop/darwin/main.m @@ -220,7 +220,7 @@ int main(int argc, const char * argv[]) { int startsHidden = 0; WailsContext *result = Create("OI OI!",400,400, frameless, resizable, fullscreen, fullSizeContent, hideTitleBar, titlebarAppearsTransparent, hideTitle, useToolbar, hideToolbarSeparator, webviewIsTransparent, alwaysOnTop, hideWindowOnClose, appearance, windowIsTranslucent, debug, windowStartState, startsHidden, 400, 400, 600, 600); - SetRGBA(result, 255, 0, 0, 255); + SetBackgroundColour(result, 255, 0, 0, 255); void *m = NewMenu(""); SetAbout(result, "Fake title", "I am a description", _Users_username_Pictures_SaltBae_png, _Users_username_Pictures_SaltBae_png_len); // AddMenuByRole(result, 1); diff --git a/v2/internal/frontend/desktop/darwin/window.go b/v2/internal/frontend/desktop/darwin/window.go index 8a1769b44..0f14eab47 100644 --- a/v2/internal/frontend/desktop/darwin/window.go +++ b/v2/internal/frontend/desktop/darwin/window.go @@ -96,8 +96,8 @@ func NewWindow(frontendOptions *options.App, debugMode bool) *Window { context: unsafe.Pointer(context), } - if frontendOptions.RGBA != nil { - result.SetRGBA(frontendOptions.RGBA.R, frontendOptions.RGBA.G, frontendOptions.RGBA.B, frontendOptions.RGBA.A) + if frontendOptions.BackgroundColour != nil { + result.SetBackgroundColour(frontendOptions.BackgroundColour.R, frontendOptions.BackgroundColour.G, frontendOptions.BackgroundColour.B, frontendOptions.BackgroundColour.A) } if frontendOptions.Mac != nil && frontendOptions.Mac.About != nil { @@ -133,8 +133,8 @@ func (w *Window) Quit() { C.Quit(w.context) } -func (w *Window) SetRGBA(r uint8, g uint8, b uint8, a uint8) { - C.SetRGBA(w.context, C.int(r), C.int(g), C.int(b), C.int(a)) +func (w *Window) SetBackgroundColour(r uint8, g uint8, b uint8, a uint8) { + C.SetBackgroundColour(w.context, C.int(r), C.int(g), C.int(b), C.int(a)) } func (w *Window) ExecJS(js string) { @@ -151,6 +151,10 @@ func (w *Window) SetSize(width int, height int) { C.SetSize(w.context, C.int(width), C.int(height)) } +func (w *Window) SetAlwaysOnTop(onTop bool) { + C.SetAlwaysOnTop(w.context, bool2Cint(onTop)) +} + func (w *Window) SetTitle(title string) { t := C.CString(title) C.SetTitle(w.context, t) diff --git a/v2/internal/frontend/desktop/linux/frontend.go b/v2/internal/frontend/desktop/linux/frontend.go index 4d045c00e..c3cb1cbb8 100644 --- a/v2/internal/frontend/desktop/linux/frontend.go +++ b/v2/internal/frontend/desktop/linux/frontend.go @@ -144,6 +144,10 @@ func (f *Frontend) WindowCenter() { f.mainWindow.Center() } +func (f *Frontend) WindowSetAlwaysOnTop(b bool) { + f.mainWindow.SetKeepAbove(b) +} + func (f *Frontend) WindowSetPosition(x, y int) { f.mainWindow.SetPosition(x, y) } @@ -205,11 +209,11 @@ func (f *Frontend) WindowSetMaxSize(width int, height int) { f.mainWindow.SetMaxSize(width, height) } -func (f *Frontend) WindowSetRGBA(col *options.RGBA) { +func (f *Frontend) WindowSetBackgroundColour(col *options.RGBA) { if col == nil { return } - f.mainWindow.SetRGBA(col.R, col.G, col.B, col.A) + f.mainWindow.SetBackgroundColour(col.R, col.G, col.B, col.A) } func (f *Frontend) Quit() { diff --git a/v2/internal/frontend/desktop/linux/gtk.go b/v2/internal/frontend/desktop/linux/gtk.go index 1592ccdc7..ead303539 100644 --- a/v2/internal/frontend/desktop/linux/gtk.go +++ b/v2/internal/frontend/desktop/linux/gtk.go @@ -11,8 +11,11 @@ extern void blockClick(GtkWidget* menuItem, gulong handler_id); extern void unblockClick(GtkWidget* menuItem, gulong handler_id); */ import "C" -import "unsafe" -import "github.com/wailsapp/wails/v2/pkg/menu" +import ( + "unsafe" + + "github.com/wailsapp/wails/v2/pkg/menu" +) func GtkMenuItemWithLabel(label string) *C.GtkWidget { cLabel := C.CString(label) @@ -37,6 +40,10 @@ func GtkRadioMenuItemWithLabel(label string, group *C.GSList) *C.GtkWidget { //export handleMenuItemClick func handleMenuItemClick(gtkWidget unsafe.Pointer) { + // Make sure to execute the final callback on a new goroutine otherwise if the callback e.g. tries to open a dialog, the + // main thread will get blocked and so the message loop blocks. As a result the app will block and shows a + // "not responding" dialog. + item := gtkSignalToMenuItem[(*C.GtkWidget)(gtkWidget)] switch item.Type { case menu.CheckboxType: @@ -51,7 +58,7 @@ func handleMenuItemClick(gtkWidget unsafe.Pointer) { C.gtk_check_menu_item_set_active(C.toGtkCheckMenuItem(unsafe.Pointer(gtkCheckbox)), checked) C.unblockClick(gtkCheckbox, handler) } - item.Click(&menu.CallbackData{MenuItem: item}) + go item.Click(&menu.CallbackData{MenuItem: item}) case menu.RadioType: gtkRadioItems := gtkRadioMenuCache[item] active := C.gtk_check_menu_item_get_active(C.toGtkCheckMenuItem(gtkWidget)) @@ -63,11 +70,11 @@ func handleMenuItemClick(gtkWidget unsafe.Pointer) { C.unblockClick(gtkRadioItem, handler) } item.Checked = true - item.Click(&menu.CallbackData{MenuItem: item}) + go item.Click(&menu.CallbackData{MenuItem: item}) } else { item.Checked = false } default: - item.Click(&menu.CallbackData{MenuItem: item}) + go item.Click(&menu.CallbackData{MenuItem: item}) } } diff --git a/v2/internal/frontend/desktop/linux/invoke.go b/v2/internal/frontend/desktop/linux/invoke.go new file mode 100644 index 000000000..16d5e73d2 --- /dev/null +++ b/v2/internal/frontend/desktop/linux/invoke.go @@ -0,0 +1,78 @@ +//go:build linux +// +build linux + +package linux + +/* +#cgo linux pkg-config: gtk+-3.0 + +#include +#include "gtk/gtk.h" + +extern gboolean invokeCallbacks(void *); + +static inline void triggerInvokesOnMainThread() { + g_idle_add((GSourceFunc)invokeCallbacks, NULL); +} +*/ +import "C" +import ( + "runtime" + "sync" + "unsafe" + + "golang.org/x/sys/unix" +) + +var ( + m sync.Mutex + mainTid int + dispatchq []func() +) + +func invokeOnMainThread(f func()) { + if tryInvokeOnCurrentGoRoutine(f) { + return + } + + m.Lock() + dispatchq = append(dispatchq, f) + m.Unlock() + + C.triggerInvokesOnMainThread() +} + +func tryInvokeOnCurrentGoRoutine(f func()) bool { + m.Lock() + mainThreadID := mainTid + m.Unlock() + + runtime.LockOSThread() + defer runtime.UnlockOSThread() + + if mainThreadID != unix.Gettid() { + return false + } + f() + return true +} + +//export invokeCallbacks +func invokeCallbacks(_ unsafe.Pointer) C.gboolean { + runtime.LockOSThread() + defer runtime.UnlockOSThread() + + m.Lock() + if mainTid == 0 { + mainTid = unix.Gettid() + } + + q := append([]func(){}, dispatchq...) + dispatchq = []func(){} + m.Unlock() + + for _, v := range q { + v() + } + return C.G_SOURCE_REMOVE +} diff --git a/v2/internal/frontend/desktop/linux/responsewriter.go b/v2/internal/frontend/desktop/linux/responsewriter.go index 12ebadae7..3b08a3845 100644 --- a/v2/internal/frontend/desktop/linux/responsewriter.go +++ b/v2/internal/frontend/desktop/linux/responsewriter.go @@ -84,7 +84,7 @@ func (rw *webKitResponseWriter) WriteHeader(code int) { } stream := C.g_unix_input_stream_new(C.int(rFD), gtkBool(true)) - C.webkit_uri_scheme_request_finish(rw.req, stream, C.long(contentLength), cMimeType) + C.webkit_uri_scheme_request_finish(rw.req, stream, C.gint64(contentLength), cMimeType) C.g_object_unref(C.gpointer(stream)) } diff --git a/v2/internal/frontend/desktop/linux/window.go b/v2/internal/frontend/desktop/linux/window.go index 7c6b6f363..374450a92 100644 --- a/v2/internal/frontend/desktop/linux/window.go +++ b/v2/internal/frontend/desktop/linux/window.go @@ -249,11 +249,10 @@ typedef struct JSCallback { char* script; } JSCallback; -gboolean executeJS(gpointer data) { +void executeJS(void *data) { struct JSCallback *js = data; webkit_web_view_run_javascript(js->webview, js->script, NULL, NULL, NULL); free(js->script); - return G_SOURCE_REMOVE; } void extern processMessageDialogResult(char*); @@ -265,8 +264,7 @@ typedef struct MessageDialogOptions { int messageType; } MessageDialogOptions; -gboolean messageDialog(gpointer data) { - +void messageDialog(void *data) { GtkDialogFlags flags; GtkMessageType messageType; MessageDialogOptions *options = (MessageDialogOptions*) data; @@ -307,14 +305,12 @@ gboolean messageDialog(gpointer data) { gtk_widget_destroy(dialog); free(options->title); free(options->message); - - return G_SOURCE_REMOVE; } void extern processOpenFileResult(void*); typedef struct OpenFileDialogOptions { - void* webview; + GtkWindow* window; char* title; char* defaultFilename; char* defaultDirectory; @@ -333,13 +329,13 @@ void freeFileFilterArray(GtkFileFilter** filters) { free(filters); } -gboolean opendialog(gpointer data) { +void opendialog(void *data) { struct OpenFileDialogOptions *options = data; char *label = "_Open"; if (options->action == GTK_FILE_CHOOSER_ACTION_SAVE) { label = "_Save"; } - GtkWidget *dlgWidget = gtk_file_chooser_dialog_new(options->title, options->webview, options->action, + GtkWidget *dlgWidget = gtk_file_chooser_dialog_new(options->title, options->window, options->action, "_Cancel", GTK_RESPONSE_CANCEL, label, GTK_RESPONSE_ACCEPT, NULL); @@ -421,7 +417,6 @@ gboolean opendialog(gpointer data) { } gtk_widget_destroy(dlgWidget); free(options->title); - return G_SOURCE_REMOVE; } GtkFileFilter* newFileFilter() { @@ -436,14 +431,20 @@ typedef struct RGBAOptions { uint8_t b; uint8_t a; void *webview; + void *window; } RGBAOptions; -gboolean setRGBA(gpointer* data) { +void setBackgroundColour(void* data) { RGBAOptions* options = (RGBAOptions*)data; GdkRGBA colour = {options->r / 255.0, options->g / 255.0, options->b / 255.0, options->a / 255.0}; webkit_web_view_set_background_color(WEBKIT_WEB_VIEW(options->webview), &colour); - - return G_SOURCE_REMOVE; + GtkCssProvider *provider = gtk_css_provider_new(); + char buffer[60]; + sprintf((void*)&buffer[0], "* { background-color: rgba(%d,%d,%d,%d); }", options->r, options->g, options->b, options->a); + gtk_css_provider_load_from_data (provider, &buffer[0], -1, NULL); + gtk_style_context_add_provider(gtk_widget_get_style_context(GTK_WIDGET(options->window)), + GTK_STYLE_PROVIDER(provider), + GTK_STYLE_PROVIDER_PRIORITY_USER); } typedef struct SetTitleArgs { @@ -572,6 +573,7 @@ void SetWindowIcon(GtkWindow* window, const guchar* buf, gsize len) { import "C" import ( "strings" + "sync" "unsafe" "github.com/wailsapp/wails/v2/internal/frontend" @@ -643,8 +645,8 @@ func NewWindow(appoptions *options.App, debug bool) *Window { } // Set background colour - RGBA := appoptions.RGBA - result.SetRGBA(RGBA.R, RGBA.G, RGBA.B, RGBA.A) + RGBA := appoptions.BackgroundColour + result.SetBackgroundColour(RGBA.R, RGBA.G, RGBA.B, RGBA.A) // Setup window result.SetKeepAbove(appoptions.AlwaysOnTop) @@ -714,13 +716,25 @@ func (w *Window) SetPosition(x int, y int) { func (w *Window) Size() (int, int) { var width, height C.int - C.gtk_window_get_size(w.asGTKWindow(), &width, &height) + var wg sync.WaitGroup + wg.Add(1) + invokeOnMainThread(func() { + C.gtk_window_get_size(w.asGTKWindow(), &width, &height) + wg.Done() + }) + wg.Wait() return int(width), int(height) } func (w *Window) GetPosition() (int, int) { var width, height C.int - C.gtk_window_get_position(w.asGTKWindow(), &width, &height) + var wg sync.WaitGroup + wg.Add(1) + invokeOnMainThread(func() { + C.gtk_window_get_position(w.asGTKWindow(), &width, &height) + wg.Done() + }) + wg.Wait() return int(width), int(height) } @@ -773,15 +787,16 @@ func (w *Window) IsMaximised() bool { return result > 0 } -func (w *Window) SetRGBA(r uint8, g uint8, b uint8, a uint8) { +func (w *Window) SetBackgroundColour(r uint8, g uint8, b uint8, a uint8) { data := C.RGBAOptions{ r: C.uchar(r), g: C.uchar(g), b: C.uchar(b), a: C.uchar(a), webview: w.webview, + window: w.gtkWindow, } - C.ExecuteOnMainThread(C.setRGBA, C.gpointer(&data)) + invokeOnMainThread(func() { C.setBackgroundColour(unsafe.Pointer(&data)) }) } @@ -840,7 +855,7 @@ func (w *Window) ExecJS(js string) { webview: w.webview, script: C.CString(js), } - C.ExecuteOnMainThread(C.executeJS, C.gpointer(&jscallback)) + invokeOnMainThread(func() { C.executeJS(unsafe.Pointer(&jscallback)) }) } func (w *Window) StartDrag() { @@ -854,7 +869,7 @@ func (w *Window) Quit() { func (w *Window) OpenFileDialog(dialogOptions frontend.OpenDialogOptions, multipleFiles int, action C.GtkFileChooserAction) { data := C.OpenFileDialogOptions{ - webview: w.webview, + window: w.asGTKWindow(), title: C.CString(dialogOptions.Title), multipleFiles: C.int(multipleFiles), action: action, @@ -864,8 +879,8 @@ func (w *Window) OpenFileDialog(dialogOptions frontend.OpenDialogOptions, multip // Create filter array mem := NewCalloc() arraySize := len(dialogOptions.Filters) + 1 - data.filters = C.allocFileFilterArray((C.ulong)(arraySize)) - filters := (*[1 << 30]*C.struct__GtkFileFilter)(unsafe.Pointer(data.filters)) + data.filters = C.allocFileFilterArray((C.size_t)(arraySize)) + filters := unsafe.Slice((**C.struct__GtkFileFilter)(unsafe.Pointer(data.filters)), arraySize) for index, filter := range dialogOptions.Filters { thisFilter := C.gtk_file_filter_new() C.g_object_ref(C.gpointer(thisFilter)) @@ -902,7 +917,7 @@ func (w *Window) OpenFileDialog(dialogOptions frontend.OpenDialogOptions, multip data.defaultDirectory = C.CString(dialogOptions.DefaultDirectory) } - C.ExecuteOnMainThread(C.opendialog, C.gpointer(&data)) + invokeOnMainThread(func() { C.opendialog(unsafe.Pointer(&data)) }) } func (w *Window) MessageDialog(dialogOptions frontend.MessageDialogOptions) { @@ -922,7 +937,7 @@ func (w *Window) MessageDialog(dialogOptions frontend.MessageDialogOptions) { case frontend.WarningDialog: data.messageType = C.int(3) } - C.ExecuteOnMainThread(C.messageDialog, C.gpointer(&data)) + invokeOnMainThread(func() { C.messageDialog(unsafe.Pointer(&data)) }) } func (w *Window) ToggleMaximise() { diff --git a/v2/internal/frontend/desktop/windows/dialog.go b/v2/internal/frontend/desktop/windows/dialog.go index f2bb7bf1d..a8fa5b8a3 100644 --- a/v2/internal/frontend/desktop/windows/dialog.go +++ b/v2/internal/frontend/desktop/windows/dialog.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/leaanthony/go-common-file-dialog/cfd" "github.com/wailsapp/wails/v2/internal/frontend" + "github.com/wailsapp/wails/v2/internal/go-common-file-dialog/cfd" "golang.org/x/sys/windows" "syscall" ) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index c2a5716cf..276db118d 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -7,6 +7,18 @@ import ( "context" "encoding/json" "fmt" + "github.com/bep/debounce" + "github.com/wailsapp/wails/v2/internal/binding" + "github.com/wailsapp/wails/v2/internal/frontend" + "github.com/wailsapp/wails/v2/internal/frontend/assetserver" + "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge" + "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/win32" + "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc" + "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc/w32" + "github.com/wailsapp/wails/v2/internal/logger" + "github.com/wailsapp/wails/v2/internal/system/operatingsystem" + "github.com/wailsapp/wails/v2/pkg/options" + "github.com/wailsapp/wails/v2/pkg/options/windows" "io" "log" "net/http" @@ -16,17 +28,7 @@ import ( "strconv" "strings" "text/template" - - "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/internal/frontend" - "github.com/wailsapp/wails/v2/internal/frontend/assetserver" - "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge" - "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc" - "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc/w32" - "github.com/wailsapp/wails/v2/internal/logger" - "github.com/wailsapp/wails/v2/internal/system/operatingsystem" - "github.com/wailsapp/wails/v2/pkg/options" - "github.com/wailsapp/wails/v2/pkg/options/windows" + "time" ) const startURL = "http://wails.localhost/" @@ -53,7 +55,8 @@ type Frontend struct { hasStarted bool // Windows build number - versionInfo *operatingsystem.WindowsVersionInfo + versionInfo *operatingsystem.WindowsVersionInfo + resizeDebouncer func(f func()) } func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.Logger, appBindings *binding.Bindings, dispatcher frontend.Dispatcher) *Frontend { @@ -70,6 +73,12 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger. versionInfo: versionInfo, } + if appoptions.Windows != nil { + if appoptions.Windows.ResizeDebounceMS > 0 { + result.resizeDebouncer = debounce.New(time.Duration(appoptions.Windows.ResizeDebounceMS) * time.Millisecond) + } + } + // We currently can't use wails://wails/ as other platforms do, therefore we map the assets sever onto the following url. result.startURL, _ = url.Parse(startURL) @@ -97,31 +106,15 @@ func (f *Frontend) WindowReload() { } func (f *Frontend) WindowSetSystemDefaultTheme() { - runtime.LockOSThread() - f.mainWindow.frontendOptions.Windows.Theme = windows.SystemDefault - f.mainWindow.Invoke(func() { - f.mainWindow.updateTheme() - }) + f.mainWindow.SetTheme(windows.SystemDefault) } func (f *Frontend) WindowSetLightTheme() { - runtime.LockOSThread() - if f.mainWindow.frontendOptions != nil && f.mainWindow.frontendOptions.Windows != nil { - f.mainWindow.frontendOptions.Windows.Theme = windows.Light - f.mainWindow.Invoke(func() { - f.mainWindow.updateTheme() - }) - } + f.mainWindow.SetTheme(windows.Light) } func (f *Frontend) WindowSetDarkTheme() { - runtime.LockOSThread() - if f.mainWindow.frontendOptions != nil && f.mainWindow.frontendOptions.Windows != nil { - f.mainWindow.frontendOptions.Windows.Theme = windows.Dark - f.mainWindow.Invoke(func() { - f.mainWindow.updateTheme() - }) - } + f.mainWindow.SetTheme(windows.Dark) } func (f *Frontend) Run(ctx context.Context) error { @@ -153,7 +146,15 @@ func (f *Frontend) Run(ctx context.Context) error { } } - f.chromium.Resize() + if f.resizeDebouncer != nil { + f.resizeDebouncer(func() { + f.mainWindow.Invoke(func() { + f.chromium.Resize() + }) + }) + } else { + f.chromium.Resize() + } }) mainWindow.OnClose().Bind(func(arg *winc.Event) { @@ -176,35 +177,47 @@ func (f *Frontend) Run(ctx context.Context) error { func (f *Frontend) WindowCenter() { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.Center() } +func (f *Frontend) WindowSetAlwaysOnTop(b bool) { + runtime.LockOSThread() + f.mainWindow.SetAlwaysOnTop(b) +} + func (f *Frontend) WindowSetPosition(x, y int) { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.SetPos(x, y) } func (f *Frontend) WindowGetPosition() (int, int) { runtime.LockOSThread() + defer runtime.UnlockOSThread() return f.mainWindow.Pos() } func (f *Frontend) WindowSetSize(width, height int) { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.SetSize(width, height) } func (f *Frontend) WindowGetSize() (int, int) { runtime.LockOSThread() + defer runtime.UnlockOSThread() return f.mainWindow.Size() } func (f *Frontend) WindowSetTitle(title string) { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.SetText(title) } func (f *Frontend) WindowFullscreen() { runtime.LockOSThread() + defer runtime.UnlockOSThread() if f.frontendOptions.Frameless && f.frontendOptions.DisableResize == false { f.ExecJS("window.wails.flags.enableResize = false;") } @@ -217,6 +230,7 @@ func (f *Frontend) WindowReloadApp() { func (f *Frontend) WindowUnfullscreen() { runtime.LockOSThread() + defer runtime.UnlockOSThread() if f.frontendOptions.Frameless && f.frontendOptions.DisableResize == false { f.ExecJS("window.wails.flags.enableResize = true;") } @@ -225,15 +239,19 @@ func (f *Frontend) WindowUnfullscreen() { func (f *Frontend) WindowShow() { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.ShowWindow() } func (f *Frontend) WindowHide() { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.Hide() } + func (f *Frontend) WindowMaximise() { runtime.LockOSThread() + defer runtime.UnlockOSThread() if f.hasStarted { if !f.frontendOptions.DisableResize { f.mainWindow.Maximise() @@ -242,8 +260,10 @@ func (f *Frontend) WindowMaximise() { f.frontendOptions.WindowStartState = options.Maximised } } + func (f *Frontend) WindowToggleMaximise() { runtime.LockOSThread() + defer runtime.UnlockOSThread() if !f.hasStarted { return } @@ -256,32 +276,38 @@ func (f *Frontend) WindowToggleMaximise() { func (f *Frontend) WindowUnmaximise() { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.Restore() } + func (f *Frontend) WindowMinimise() { runtime.LockOSThread() + defer runtime.UnlockOSThread() if f.hasStarted { f.mainWindow.Minimise() } else { f.frontendOptions.WindowStartState = options.Minimised } } + func (f *Frontend) WindowUnminimise() { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.Restore() } func (f *Frontend) WindowSetMinSize(width int, height int) { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.SetMinSize(width, height) } func (f *Frontend) WindowSetMaxSize(width int, height int) { runtime.LockOSThread() + defer runtime.UnlockOSThread() f.mainWindow.SetMaxSize(width, height) } -func (f *Frontend) WindowSetRGBA(col *options.RGBA) { - runtime.LockOSThread() +func (f *Frontend) WindowSetBackgroundColour(col *options.RGBA) { if col == nil { return } @@ -311,6 +337,7 @@ func (f *Frontend) WindowSetRGBA(col *options.RGBA) { log.Fatal(err) } }) + } func (f *Frontend) Quit() { @@ -325,8 +352,9 @@ func (f *Frontend) Quit() { func (f *Frontend) setupChromium() { chromium := edge.NewChromium() f.chromium = chromium - if opts := f.frontendOptions.Windows; opts != nil && opts.WebviewUserDataPath != "" { + if opts := f.frontendOptions.Windows; opts != nil { chromium.DataPath = opts.WebviewUserDataPath + chromium.BrowserPath = opts.WebviewBrowserPath } chromium.MessageCallback = f.processMessage chromium.WebResourceRequestedCallback = f.processRequest @@ -371,7 +399,7 @@ func (f *Frontend) setupChromium() { onFocus.Bind(f.onFocus) // Set background colour - f.WindowSetRGBA(f.frontendOptions.RGBA) + f.WindowSetBackgroundColour(f.frontendOptions.BackgroundColour) chromium.SetGlobalPermission(edge.CoreWebView2PermissionStateAllow) chromium.AddWebResourceRequestedFilter("*", edge.COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL) @@ -572,29 +600,55 @@ func (f *Frontend) navigationCompleted(sender *edge.ICoreWebView2, args *edge.IC switch f.frontendOptions.WindowStartState { case options.Maximised: if !f.frontendOptions.DisableResize { - f.mainWindow.Maximise() + win32.ShowWindowMaximised(f.mainWindow.Handle()) } else { - f.mainWindow.Show() + win32.ShowWindow(f.mainWindow.Handle()) } - f.ShowWindow() - case options.Minimised: - f.mainWindow.Minimise() + win32.ShowWindowMinimised(f.mainWindow.Handle()) case options.Fullscreen: f.mainWindow.Fullscreen() - f.ShowWindow() + win32.ShowWindow(f.mainWindow.Handle()) default: if f.frontendOptions.Fullscreen { f.mainWindow.Fullscreen() } - f.ShowWindow() + win32.ShowWindow(f.mainWindow.Handle()) } + f.mainWindow.hasBeenShown = true + } func (f *Frontend) ShowWindow() { f.mainWindow.Invoke(func() { - f.mainWindow.Restore() + if !f.mainWindow.hasBeenShown { + f.mainWindow.hasBeenShown = true + switch f.frontendOptions.WindowStartState { + case options.Maximised: + if !f.frontendOptions.DisableResize { + win32.ShowWindowMaximised(f.mainWindow.Handle()) + } else { + win32.ShowWindow(f.mainWindow.Handle()) + } + case options.Minimised: + win32.RestoreWindow(f.mainWindow.Handle()) + case options.Fullscreen: + f.mainWindow.Fullscreen() + win32.ShowWindow(f.mainWindow.Handle()) + default: + if f.frontendOptions.Fullscreen { + f.mainWindow.Fullscreen() + } + win32.ShowWindow(f.mainWindow.Handle()) + } + } else { + if win32.IsWindowMinimised(f.mainWindow.Handle()) { + win32.RestoreWindow(f.mainWindow.Handle()) + } else { + win32.ShowWindow(f.mainWindow.Handle()) + } + } w32.SetForegroundWindow(f.mainWindow.Handle()) w32.SetFocus(f.mainWindow.Handle()) }) diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go index 701601bc0..a4cf31a32 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/ICoreWebViewSettings.go @@ -1,8 +1,9 @@ package edge import ( - "golang.org/x/sys/windows" "unsafe" + + "golang.org/x/sys/windows" ) // ICoreWebviewSettings is the merged settings class @@ -27,17 +28,17 @@ type _ICoreWebViewSettingsVtbl struct { PutIsZoomControlEnabled ComProc GetIsBuiltInErrorPageEnabled ComProc PutIsBuiltInErrorPageEnabled ComProc - GetUserAgent ComProc + GetUserAgent ComProc // ICoreWebView2Settings2: SDK 1.0.864.35 PutUserAgent ComProc - GetAreBrowserAcceleratorKeysEnabled ComProc + GetAreBrowserAcceleratorKeysEnabled ComProc // ICoreWebView2Settings3: SDK 1.0.864.35 PutAreBrowserAcceleratorKeysEnabled ComProc - GetIsPasswordAutosaveEnabled ComProc + GetIsPasswordAutosaveEnabled ComProc // ICoreWebView2Settings4: SDK 1.0.902.49 PutIsPasswordAutosaveEnabled ComProc GetIsGeneralAutofillEnabled ComProc PutIsGeneralAutofillEnabled ComProc - GetIsPinchZoomEnabled ComProc + GetIsPinchZoomEnabled ComProc // ICoreWebView2Settings5: SDK 1.0.902.49 PutIsPinchZoomEnabled ComProc - GetIsSwipeNavigationEnabled ComProc + GetIsSwipeNavigationEnabled ComProc // ICoreWebView2Settings6: SDK 1.0.992.28 PutIsSwipeNavigationEnabled ComProc } diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/chromium.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/chromium.go index ad046a5c5..785140917 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/chromium.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/chromium.go @@ -4,6 +4,7 @@ package edge import ( + "errors" "log" "os" "path/filepath" @@ -30,8 +31,9 @@ type Chromium struct { environment *ICoreWebView2Environment // Settings - Debug bool - DataPath string + Debug bool + DataPath string + BrowserPath string // permissions permissions map[CoreWebView2PermissionKind]CoreWebView2PermissionState @@ -84,7 +86,27 @@ func (e *Chromium) Embed(hwnd uintptr) bool { dataPath = filepath.Join(os.Getenv("AppData"), currentExeName) } - res, err := createCoreWebView2EnvironmentWithOptions(nil, windows.StringToUTF16Ptr(dataPath), 0, e.envCompleted) + var browserPathPtr *uint16 = nil + if e.BrowserPath != "" { + if _, err := os.Stat(e.BrowserPath); !errors.Is(err, os.ErrNotExist) { + browserPathPtr, err = windows.UTF16PtrFromString(e.BrowserPath) + if err != nil { + log.Printf("Error calling UTF16PtrFromString for %s: %v", e.BrowserPath, err) + return false + } + } else { + log.Printf("Browser path %s does not exist", e.BrowserPath) + return false + } + } + + dataPathPtr, err := windows.UTF16PtrFromString(dataPath) + if err != nil { + log.Printf("Error calling UTF16PtrFromString for %s: %v", dataPath, err) + return false + } + + res, err := createCoreWebView2EnvironmentWithOptions(browserPathPtr, dataPathPtr, 0, e.envCompleted) if err != nil { log.Printf("Error calling Webview2Loader: %v", err) return false diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/module.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/module.go index 7566c2894..e8ae8fab5 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/module.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/module.go @@ -10,11 +10,6 @@ import ( ) var ( - nativeModule = windows.NewLazyDLL("WebView2Loader") - nativeCreate = nativeModule.NewProc("CreateCoreWebView2EnvironmentWithOptions") - nativeCompareBrowserVersions = nativeModule.NewProc("CompareBrowserVersions") - nativeGetAvailableCoreWebView2BrowserVersionString = nativeModule.NewProc("GetAvailableCoreWebView2BrowserVersionString") - memOnce sync.Once memModule winloader.Module memCreate winloader.Proc @@ -23,12 +18,16 @@ var ( memErr error ) -// CompareBrowserVersions will compare the 2 given versions and return: -// -1 = v1 < v2 -// 0 = v1 == v2 -// 1 = v1 > v2 -func CompareBrowserVersions(v1 string, v2 string) (int, error) { +const ( + // https://referencesource.microsoft.com/#system.web/Util/hresults.cs,20 + E_FILENOTFOUND = 0x80070002 +) +// CompareBrowserVersions will compare the 2 given versions and return: +// Less than zero: v1 < v2 +// zero: v1 == v2 +// Greater than zero: v1 > v2 +func CompareBrowserVersions(v1 string, v2 string) (int, error) { _v1, err := windows.UTF16PtrFromString(v1) if err != nil { return 0, err @@ -38,57 +37,54 @@ func CompareBrowserVersions(v1 string, v2 string) (int, error) { return 0, err } - nativeErr := nativeModule.Load() - if nativeErr == nil { - nativeErr = nativeCompareBrowserVersions.Find() - } - var result int - if nativeErr != nil { - err := loadFromMemory(nativeErr) - if err != nil { - return 0, fmt.Errorf("Unable to load WebView2Loader.dll from disk: %v -- or from memory: %w", nativeErr, memErr) - } - _, _, err = memCompareBrowserVersions.Call( - uint64(uintptr(unsafe.Pointer(_v1))), - uint64(uintptr(unsafe.Pointer(_v2))), - uint64(uintptr(unsafe.Pointer(&result)))) - } else { - _, _, err = nativeCompareBrowserVersions.Call( - uintptr(unsafe.Pointer(_v1)), - uintptr(unsafe.Pointer(_v2)), - uintptr(unsafe.Pointer(&result))) + err = loadFromMemory() + if err != nil { + return 0, err } + + var result int32 + _, _, err = memCompareBrowserVersions.Call( + uint64(uintptr(unsafe.Pointer(_v1))), + uint64(uintptr(unsafe.Pointer(_v2))), + uint64(uintptr(unsafe.Pointer(&result)))) + if err != windows.ERROR_SUCCESS { - return result, err + return 0, err } - return result, nil + return int(result), nil } -// GetInstalledVersion returns the installed version of the webview2 runtime. +// GetWebviewVersion returns version of the webview2 runtime. +// If path is empty, it will try to find installed webview2 is the system. // If there is no version installed, a blank string is returned. -func GetInstalledVersion() (string, error) { - nativeErr := nativeModule.Load() - if nativeErr == nil { - nativeErr = nativeGetAvailableCoreWebView2BrowserVersionString.Find() - } - var err error - var result *uint16 - if nativeErr != nil { - err := loadFromMemory(nativeErr) - if err != nil { - return "", fmt.Errorf("Unable to load WebView2Loader.dll from disk: %v -- or from memory: %w", nativeErr, memErr) - } - _, _, err = memGetAvailableCoreWebView2BrowserVersionString.Call( - uint64(uintptr(unsafe.Pointer(nil))), - uint64(uintptr(unsafe.Pointer(&result)))) - } else { - _, _, err = nativeCompareBrowserVersions.Call( - uintptr(unsafe.Pointer(nil)), - uintptr(unsafe.Pointer(&result))) - } +func GetWebviewVersion(path string) (string, error) { + err := loadFromMemory() if err != nil { return "", err } + + var browserPath *uint16 = nil + if path != "" { + browserPath, err = windows.UTF16PtrFromString(path) + if err != nil { + return "", fmt.Errorf("error calling UTF16PtrFromString for %s: %v", path, err) + } + } + + var result *uint16 + res, _, err := memGetAvailableCoreWebView2BrowserVersionString.Call( + uint64(uintptr(unsafe.Pointer(browserPath))), + uint64(uintptr(unsafe.Pointer(&result)))) + + if res != 0 { + if res == E_FILENOTFOUND { + // Webview2 is not installed + return "", nil + } + + return "", fmt.Errorf("Unable to call GetAvailableCoreWebView2BrowserVersionString (%x): %w", res, err) + } + version := windows.UTF16PtrToString(result) windows.CoTaskMemFree(unsafe.Pointer(result)) return version, nil @@ -97,39 +93,26 @@ func GetInstalledVersion() (string, error) { // CreateCoreWebView2EnvironmentWithOptions tries to load WebviewLoader2 and // call the CreateCoreWebView2EnvironmentWithOptions routine. func CreateCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataFolder *uint16, environmentOptions uintptr, environmentCompletedHandle uintptr) (uintptr, error) { - nativeErr := nativeModule.Load() - if nativeErr == nil { - nativeErr = nativeCreate.Find() + err := loadFromMemory() + if err != nil { + return 0, err } - if nativeErr != nil { - err := loadFromMemory(nativeErr) - if err != nil { - return 0, err - } - res, _, _ := memCreate.Call( - uint64(uintptr(unsafe.Pointer(browserExecutableFolder))), - uint64(uintptr(unsafe.Pointer(userDataFolder))), - uint64(environmentOptions), - uint64(environmentCompletedHandle), - ) - return uintptr(res), nil - } - res, _, _ := nativeCreate.Call( - uintptr(unsafe.Pointer(browserExecutableFolder)), - uintptr(unsafe.Pointer(userDataFolder)), - environmentOptions, - environmentCompletedHandle, + res, _, _ := memCreate.Call( + uint64(uintptr(unsafe.Pointer(browserExecutableFolder))), + uint64(uintptr(unsafe.Pointer(userDataFolder))), + uint64(environmentOptions), + uint64(environmentCompletedHandle), ) - return res, nil + return uintptr(res), nil } -func loadFromMemory(nativeErr error) error { +func loadFromMemory() error { var err error // DLL is not available natively. Try loading embedded copy. memOnce.Do(func() { memModule, memErr = winloader.LoadFromMemory(WebView2Loader) if memErr != nil { - err = fmt.Errorf("Unable to load WebView2Loader.dll from disk: %v -- or from memory: %w", nativeErr, memErr) + err = fmt.Errorf("Unable to load WebView2Loader.dll from memory: %w", memErr) return } memCreate = memModule.Proc("CreateCoreWebView2EnvironmentWithOptions") diff --git a/v2/internal/frontend/desktop/windows/theme.go b/v2/internal/frontend/desktop/windows/theme.go index 842d7480d..897133026 100644 --- a/v2/internal/frontend/desktop/windows/theme.go +++ b/v2/internal/frontend/desktop/windows/theme.go @@ -7,6 +7,12 @@ import ( func (w *Window) updateTheme() { + // Don't redraw theme if nothing has changed + if !w.themeChanged { + return + } + w.themeChanged = false + if win32.IsCurrentlyHighContrastMode() { return } @@ -14,25 +20,24 @@ func (w *Window) updateTheme() { if !win32.SupportsThemes() { return } - // Only process if there's a theme change - isDarkMode := win32.IsCurrentlyDarkMode() - w.isDarkMode = isDarkMode - // Default use system theme + var isDarkMode bool + switch w.theme { + case windows.SystemDefault: + isDarkMode = win32.IsCurrentlyDarkMode() + case windows.Dark: + isDarkMode = true + case windows.Light: + isDarkMode = false + } + win32.SetTheme(w.Handle(), isDarkMode) + + // Custom theme processing winOptions := w.frontendOptions.Windows var customTheme *windows.ThemeSettings if winOptions != nil { customTheme = winOptions.CustomTheme - if winOptions.Theme == windows.Dark { - isDarkMode = true - } - if winOptions.Theme == windows.Light { - isDarkMode = false - } } - - win32.SetTheme(w.Handle(), isDarkMode) - // Custom theme if win32.SupportsCustomThemes() && customTheme != nil { if w.isActive { diff --git a/v2/internal/frontend/desktop/windows/win32/consts.go b/v2/internal/frontend/desktop/windows/win32/consts.go index a35465422..66f648021 100644 --- a/v2/internal/frontend/desktop/windows/win32/consts.go +++ b/v2/internal/frontend/desktop/windows/win32/consts.go @@ -12,9 +12,12 @@ type HRESULT int32 type HANDLE uintptr var ( - moduser32 = syscall.NewLazyDLL("user32.dll") - procSystemParametersInfo = moduser32.NewProc("SystemParametersInfoW") - procGetWindowLong = moduser32.NewProc("GetWindowLongW") + moduser32 = syscall.NewLazyDLL("user32.dll") + procSystemParametersInfo = moduser32.NewProc("SystemParametersInfoW") + procGetWindowLong = moduser32.NewProc("GetWindowLongW") + procSetClassLong = moduser32.NewProc("SetClassLongW") + procSetClassLongPtr = moduser32.NewProc("SetClassLongPtrW") + procShowWindow = moduser32.NewProc("ShowWindow") procLookupIconIdFromDirectoryEx = moduser32.NewProc("LookupIconIdFromDirectoryEx") procCreateIconFromResourceEx = moduser32.NewProc("CreateIconFromResourceEx") procCreateIconIndirect = moduser32.NewProc("CreateIconIndirect") @@ -30,6 +33,11 @@ var ( procDwmSetWindowAttribute = moddwmapi.NewProc("DwmSetWindowAttribute") procDwmExtendFrameIntoClientArea = moddwmapi.NewProc("DwmExtendFrameIntoClientArea") ) +var ( + modwingdi = syscall.NewLazyDLL("gdi32.dll") + procCreateSolidBrush = modwingdi.NewProc("CreateSolidBrush") +) + var windowsVersion, _ = operatingsystem.GetWindowsVersionInfo() func IsWindowsVersionAtLeast(major, minor, buildNumber int) bool { diff --git a/v2/internal/frontend/desktop/windows/win32/theme.go b/v2/internal/frontend/desktop/windows/win32/theme.go index aefa73813..89aa9fc74 100644 --- a/v2/internal/frontend/desktop/windows/win32/theme.go +++ b/v2/internal/frontend/desktop/windows/win32/theme.go @@ -1,11 +1,8 @@ -//go:build windows - package win32 import ( - "unsafe" - "golang.org/x/sys/windows/registry" + "unsafe" ) type DWMWINDOWATTRIBUTE int32 @@ -15,10 +12,19 @@ const DwmwaUseImmersiveDarkMode DWMWINDOWATTRIBUTE = 20 const DwmwaBorderColor DWMWINDOWATTRIBUTE = 34 const DwmwaCaptionColor DWMWINDOWATTRIBUTE = 35 const DwmwaTextColor DWMWINDOWATTRIBUTE = 36 +const DwmwaSystemBackdropType DWMWINDOWATTRIBUTE = 38 const SPI_GETHIGHCONTRAST = 0x0042 const HCF_HIGHCONTRASTON = 0x00000001 +type BackdropType int32 + +const DwmsbtAuto BackdropType = 0 +const DwmsbtDisable = 1 // None +const DwmsbtMainWindow = 2 // Mica +const DwmsbtTransientWindow = 3 // Acrylic +const DwmsbtTabbedWindow = 4 // Tabbed + func dwmSetWindowAttribute(hwnd uintptr, dwAttribute DWMWINDOWATTRIBUTE, pvAttribute unsafe.Pointer, cbAttribute uintptr) { ret, _, err := procDwmSetWindowAttribute.Call( hwnd, @@ -46,7 +52,19 @@ func SetTheme(hwnd uintptr, useDarkMode bool) { if IsWindowsVersionAtLeast(10, 0, 18985) { attr = DwmwaUseImmersiveDarkMode } - dwmSetWindowAttribute(hwnd, attr, unsafe.Pointer(&useDarkMode), unsafe.Sizeof(&useDarkMode)) + var winDark int32 + if useDarkMode { + winDark = 1 + } + dwmSetWindowAttribute(hwnd, attr, unsafe.Pointer(&winDark), unsafe.Sizeof(winDark)) + } +} + +func EnableTranslucency(hwnd uintptr, backdrop BackdropType) { + if IsWindowsVersionAtLeast(10, 0, 22579) { + dwmSetWindowAttribute(hwnd, DwmwaSystemBackdropType, unsafe.Pointer(&backdrop), unsafe.Sizeof(backdrop)) + } else { + println("Warning: Translucency unavailable on Windows < 22579") } } @@ -73,7 +91,6 @@ func IsCurrentlyDarkMode() bool { if err != nil { return false } - return AppsUseLightTheme == 0 } @@ -91,5 +108,6 @@ func IsCurrentlyHighContrastMode() bool { _ = err return false } - return result.DwFlags&HCF_HIGHCONTRASTON == HCF_HIGHCONTRASTON + r := result.DwFlags&HCF_HIGHCONTRASTON == HCF_HIGHCONTRASTON + return r } diff --git a/v2/internal/frontend/desktop/windows/win32/window.go b/v2/internal/frontend/desktop/windows/win32/window.go index 48263aaf2..1ddcf4c98 100644 --- a/v2/internal/frontend/desktop/windows/win32/window.go +++ b/v2/internal/frontend/desktop/windows/win32/window.go @@ -5,16 +5,62 @@ package win32 import ( "fmt" "log" + "strconv" "syscall" "unsafe" + + "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc" ) const ( WS_MAXIMIZE = 0x01000000 + WS_MINIMIZE = 0x20000000 GWL_STYLE = -16 ) +const ( + SW_HIDE = 0 + SW_NORMAL = 1 + SW_SHOWNORMAL = 1 + SW_SHOWMINIMIZED = 2 + SW_MAXIMIZE = 3 + SW_SHOWMAXIMIZED = 3 + SW_SHOWNOACTIVATE = 4 + SW_SHOW = 5 + SW_MINIMIZE = 6 + SW_SHOWMINNOACTIVE = 7 + SW_SHOWNA = 8 + SW_RESTORE = 9 + SW_SHOWDEFAULT = 10 + SW_FORCEMINIMIZE = 11 +) + +const ( + GCLP_HBRBACKGROUND int32 = -10 +) + +// Power +const ( + // WM_POWERBROADCAST - Notifies applications that a power-management event has occurred. + WM_POWERBROADCAST = 536 + + // PBT_APMPOWERSTATUSCHANGE - Power status has changed. + PBT_APMPOWERSTATUSCHANGE = 10 + + // PBT_APMRESUMEAUTOMATIC -Operation is resuming automatically from a low-power state. This message is sent every time the system resumes. + PBT_APMRESUMEAUTOMATIC = 18 + + // PBT_APMRESUMESUSPEND - Operation is resuming from a low-power state. This message is sent after PBT_APMRESUMEAUTOMATIC if the resume is triggered by user input, such as pressing a key. + PBT_APMRESUMESUSPEND = 7 + + // PBT_APMSUSPEND - System is suspending operation. + PBT_APMSUSPEND = 4 + + // PBT_POWERSETTINGCHANGE - A power setting change event has been received. + PBT_POWERSETTINGCHANGE = 32787 +) + // http://msdn.microsoft.com/en-us/library/windows/desktop/bb773244.aspx type MARGINS struct { CxLeftWidth, CxRightWidth, CyTopHeight, CyBottomHeight int32 @@ -36,6 +82,31 @@ func IsWindowMaximised(hwnd uintptr) bool { style := uint32(getWindowLong(hwnd, GWL_STYLE)) return style&WS_MAXIMIZE != 0 } +func IsWindowMinimised(hwnd uintptr) bool { + style := uint32(getWindowLong(hwnd, GWL_STYLE)) + return style&WS_MINIMIZE != 0 +} + +func RestoreWindow(hwnd uintptr) { + showWindow(hwnd, SW_RESTORE) +} + +func ShowWindow(hwnd uintptr) { + showWindow(hwnd, SW_SHOW) +} + +func ShowWindowMaximised(hwnd uintptr) { + showWindow(hwnd, SW_MAXIMIZE) +} +func ShowWindowMinimised(hwnd uintptr) { + showWindow(hwnd, SW_MINIMIZE) +} + +func SetBackgroundColour(hwnd uintptr, r, g, b uint8) { + col := winc.RGB(r, g, b) + hbrush, _, _ := procCreateSolidBrush.Call(uintptr(col)) + setClassLongPtr(hwnd, GCLP_HBRBACKGROUND, hbrush) +} func dwmExtendFrameIntoClientArea(hwnd uintptr, margins *MARGINS) error { ret, _, _ := procDwmExtendFrameIntoClientArea.Call( @@ -49,6 +120,27 @@ func dwmExtendFrameIntoClientArea(hwnd uintptr, margins *MARGINS) error { return nil } +func setClassLongPtr(hwnd uintptr, param int32, val uintptr) bool { + proc := procSetClassLongPtr + if strconv.IntSize == 32 { + /* + https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setclasslongptrw + Note: To write code that is compatible with both 32-bit and 64-bit Windows, use SetClassLongPtr. + When compiling for 32-bit Windows, SetClassLongPtr is defined as a call to the SetClassLong function + + => We have to do this dynamically when directly calling the DLL procedures + */ + proc = procSetClassLong + } + + ret, _, _ := proc.Call( + hwnd, + uintptr(param), + val, + ) + return ret != 0 +} + func getWindowLong(hwnd uintptr, index int) int32 { ret, _, _ := procGetWindowLong.Call( hwnd, @@ -56,3 +148,11 @@ func getWindowLong(hwnd uintptr, index int) int32 { return int32(ret) } + +func showWindow(hwnd uintptr, cmdshow int) bool { + ret, _, _ := procShowWindow.Call( + hwnd, + uintptr(cmdshow)) + + return ret != 0 +} diff --git a/v2/internal/frontend/desktop/windows/winc/controlbase.go b/v2/internal/frontend/desktop/windows/winc/controlbase.go index 1f7cb66ff..610e67e3b 100644 --- a/v2/internal/frontend/desktop/windows/winc/controlbase.go +++ b/v2/internal/frontend/desktop/windows/winc/controlbase.go @@ -267,6 +267,13 @@ func (cba *ControlBase) SetPos(x, y int) { w32.SetWindowPos(cba.hwnd, w32.HWND_TOP, int(workRect.Left)+x, int(workRect.Top)+y, 0, 0, w32.SWP_NOSIZE) } +func (cba *ControlBase) SetAlwaysOnTop(b bool) { + if b { + w32.SetWindowPos(cba.hwnd, w32.HWND_TOPMOST, 0, 0, 0, 0, w32.SWP_NOSIZE|w32.SWP_NOMOVE) + } else { + w32.SetWindowPos(cba.hwnd, w32.HWND_NOTOPMOST, 0, 0, 0, 0, w32.SWP_NOSIZE|w32.SWP_NOMOVE) + } +} func (cba *ControlBase) Pos() (x, y int) { rect := w32.GetWindowRect(cba.hwnd) diff --git a/v2/internal/frontend/desktop/windows/window.go b/v2/internal/frontend/desktop/windows/window.go index 21170bfe7..5bbada150 100644 --- a/v2/internal/frontend/desktop/windows/window.go +++ b/v2/internal/frontend/desktop/windows/window.go @@ -3,14 +3,16 @@ package windows import ( + "unsafe" + "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/win32" "github.com/wailsapp/wails/v2/internal/system/operatingsystem" - "unsafe" "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc" "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc/w32" "github.com/wailsapp/wails/v2/pkg/menu" "github.com/wailsapp/wails/v2/pkg/options" + winoptions "github.com/wailsapp/wails/v2/pkg/options/windows" ) type Window struct { @@ -22,6 +24,14 @@ type Window struct { versionInfo *operatingsystem.WindowsVersionInfo isDarkMode bool isActive bool + hasBeenShown bool + + // Theme + theme winoptions.Theme + themeChanged bool + + OnSuspend func() + OnResume func() } func NewWindow(parent winc.Controller, appoptions *options.App, versionInfo *operatingsystem.WindowsVersionInfo) *Window { @@ -33,6 +43,7 @@ func NewWindow(parent winc.Controller, appoptions *options.App, versionInfo *ope maxWidth: appoptions.MaxWidth, versionInfo: versionInfo, isActive: true, + themeChanged: true, } result.SetIsForm(true) @@ -65,6 +76,16 @@ func NewWindow(parent winc.Controller, appoptions *options.App, versionInfo *ope } } + if appoptions.BackgroundColour != nil { + win32.SetBackgroundColour(result.Handle(), appoptions.BackgroundColour.R, appoptions.BackgroundColour.G, appoptions.BackgroundColour.B) + } + + if appoptions.Windows != nil { + result.theme = appoptions.Windows.Theme + } else { + result.theme = winoptions.SystemDefault + } + result.SetSize(appoptions.Width, appoptions.Height) result.SetText(appoptions.Title) result.EnableSizable(!appoptions.DisableResize) @@ -77,8 +98,15 @@ func NewWindow(parent winc.Controller, appoptions *options.App, versionInfo *ope result.updateTheme() if appoptions.Windows != nil { + result.OnSuspend = appoptions.Windows.OnSuspend + result.OnResume = appoptions.Windows.OnResume if appoptions.Windows.WindowIsTranslucent { - result.SetTranslucentBackground() + // TODO: Migrate to win32 package + if !win32.IsWindowsVersionAtLeast(10, 0, 22579) { + result.SetTranslucentBackground() + } else { + win32.EnableTranslucency(result.Handle(), win32.BackdropType(appoptions.Windows.TranslucencyType)) + } } if appoptions.Windows.DisableWindowIcon { @@ -133,9 +161,22 @@ func (w *Window) SetMaxSize(maxWidth int, maxHeight int) { func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr { switch msg { + case win32.WM_POWERBROADCAST: + switch wparam { + case win32.PBT_APMSUSPEND: + if w.OnSuspend != nil { + w.OnSuspend() + } + case win32.PBT_APMRESUMEAUTOMATIC: + if w.OnResume != nil { + w.OnResume() + } + } + case w32.WM_SETTINGCHANGE: settingChanged := w32.UTF16PtrToString((*uint16)(unsafe.Pointer(lparam))) if settingChanged == "ImmersiveColorSet" { + w.themeChanged = true w.updateTheme() } return 0 @@ -143,10 +184,11 @@ func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr { w32.SetFocus(w.Handle()) case w32.WM_MOVE, w32.WM_MOVING: if w.notifyParentWindowPositionChanged != nil { - w.notifyParentWindowPositionChanged() + _ = w.notifyParentWindowPositionChanged() } case w32.WM_ACTIVATE: //if !w.frontendOptions.Frameless { + w.themeChanged = true if int(wparam) == w32.WA_INACTIVE { w.isActive = false w.updateTheme() @@ -185,6 +227,8 @@ func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr { // This hides the titlebar and also disables the resizing from user interaction because the standard frame is not // shown. We still need the WS_THICKFRAME style to enable resizing from the frontend. if wparam != 0 { + rgrc := (*w32.RECT)(unsafe.Pointer(lparam)) + style := uint32(w32.GetWindowLong(w.Handle(), w32.GWL_STYLE)) if style&w32.WS_MAXIMIZE != 0 { // If the window is maximized we must adjust the client area to the work area of the monitor. Otherwise @@ -194,7 +238,6 @@ func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr { var monitorInfo w32.MONITORINFO monitorInfo.CbSize = uint32(unsafe.Sizeof(monitorInfo)) if w32.GetMonitorInfo(monitor, &monitorInfo) { - rgrc := (*w32.RECT)(unsafe.Pointer(lparam)) *rgrc = monitorInfo.RcWork maxWidth := w.frontendOptions.MaxWidth @@ -214,6 +257,10 @@ func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr { } } } + } else { + // This is needed to workaround the resize flickering in frameless mode with WindowDecorations + // See: https://stackoverflow.com/a/6558508 + rgrc.Bottom -= 1 } return 0 @@ -225,5 +272,16 @@ func (w *Window) WndProc(msg uint32, wparam, lparam uintptr) uintptr { func (w *Window) IsMaximised() bool { return win32.IsWindowMaximised(w.Handle()) - +} + +func (w *Window) IsMinimised() bool { + return win32.IsWindowMinimised(w.Handle()) +} + +func (w *Window) SetTheme(theme winoptions.Theme) { + w.theme = theme + w.themeChanged = true + w.Invoke(func() { + w.updateTheme() + }) } diff --git a/v2/internal/frontend/devserver/devserver.go b/v2/internal/frontend/devserver/devserver.go index 356272119..784f3e203 100644 --- a/v2/internal/frontend/devserver/devserver.go +++ b/v2/internal/frontend/devserver/devserver.go @@ -77,7 +77,7 @@ func (d *DevWebServer) Run(ctx context.Context) error { }) var err error - assetHandler, err = assetserver.NewAsssetHandler(ctx, d.appoptions) + assetHandler, err = assetserver.NewAssetHandler(ctx, d.appoptions) if err != nil { log.Fatal(err) } @@ -211,6 +211,9 @@ func (d *DevWebServer) WindowMinimise() { func (d *DevWebServer) WindowUnminimise() { d.desktopFrontend.WindowUnminimise() } +func (d *DevWebServer) WindowSetAlwaysOnTop(b bool) { + d.desktopFrontend.WindowSetAlwaysOnTop(b) +} func (d *DevWebServer) WindowSetPosition(x int, y int) { d.desktopFrontend.WindowSetPosition(x, y) @@ -244,8 +247,8 @@ func (d *DevWebServer) WindowUnfullscreen() { d.desktopFrontend.WindowUnfullscreen() } -func (d *DevWebServer) WindowSetRGBA(col *options.RGBA) { - d.desktopFrontend.WindowSetRGBA(col) +func (d *DevWebServer) WindowSetBackgroundColour(col *options.RGBA) { + d.desktopFrontend.WindowSetBackgroundColour(col) } func (d *DevWebServer) MenuSetApplicationMenu(menu *menu.Menu) { diff --git a/v2/internal/frontend/dispatcher/window.go b/v2/internal/frontend/dispatcher/window.go index 78da341f7..7e136e069 100644 --- a/v2/internal/frontend/dispatcher/window.go +++ b/v2/internal/frontend/dispatcher/window.go @@ -32,6 +32,12 @@ func (d *Dispatcher) processWindowMessage(message string, sender frontend.Fronte go sender.WindowSetLightTheme() case "DT": go sender.WindowSetDarkTheme() + case "TP:0", "TP:1": + if message[2:] == "TP:0" { + go sender.WindowSetAlwaysOnTop(false) + } else if message[2:] == "TP:1" { + go sender.WindowSetAlwaysOnTop(true) + } } case 'c': go sender.WindowCenter() @@ -64,7 +70,7 @@ func (d *Dispatcher) processWindowMessage(message string, sender frontend.Fronte if err != nil { return "", err } - go sender.WindowSetRGBA(&rgba) + go sender.WindowSetBackgroundColour(&rgba) case 'M': go sender.WindowMaximise() case 't': diff --git a/v2/internal/frontend/frontend.go b/v2/internal/frontend/frontend.go index 6cf14855f..fa5da491c 100644 --- a/v2/internal/frontend/frontend.go +++ b/v2/internal/frontend/frontend.go @@ -77,6 +77,7 @@ type Frontend interface { WindowUnmaximise() WindowMinimise() WindowUnminimise() + WindowSetAlwaysOnTop(b bool) WindowSetPosition(x int, y int) WindowGetPosition() (int, int) WindowSetSize(width int, height int) @@ -85,7 +86,7 @@ type Frontend interface { WindowSetMaxSize(width int, height int) WindowFullscreen() WindowUnfullscreen() - WindowSetRGBA(col *options.RGBA) + WindowSetBackgroundColour(col *options.RGBA) WindowReload() WindowReloadApp() WindowSetSystemDefaultTheme() diff --git a/v2/internal/frontend/runtime/desktop/window.js b/v2/internal/frontend/runtime/desktop/window.js index de1c512cd..41e4d6704 100644 --- a/v2/internal/frontend/runtime/desktop/window.js +++ b/v2/internal/frontend/runtime/desktop/window.js @@ -114,6 +114,21 @@ export function WindowSetMinSize(width, height) { window.WailsInvoke('Wz:' + width + ':' + height); } + + +/** + * Set the window AlwaysOnTop or not on top + * + * @export + */ +export function WindowSetAlwaysOnTop(b) { + + window.WailsInvoke('WATP:' + (b ? '1' : '0')); +} + + + + /** * Set the Position of the window * @@ -198,7 +213,6 @@ export function WindowUnminimise() { window.WailsInvoke('Wu'); } - /** * Sets the background colour of the window * @@ -208,7 +222,7 @@ export function WindowUnminimise() { * @param {number} B Blue * @param {number} A Alpha */ -export function WindowSetRGBA(R, G, B, A) { +export function WindowSetBackgroundColour(R, G, B, A) { let rgba = JSON.stringify({r: R || 0, g: G || 0, b: B || 0, a: A || 255}); window.WailsInvoke('Wr:' + rgba); } diff --git a/v2/internal/frontend/runtime/dev/package-lock.json b/v2/internal/frontend/runtime/dev/package-lock.json index 4413e7f6b..ee4166ac2 100644 --- a/v2/internal/frontend/runtime/dev/package-lock.json +++ b/v2/internal/frontend/runtime/dev/package-lock.json @@ -519,9 +519,9 @@ "dev": true }, "shell-quote": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", - "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz", + "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==", "dev": true }, "side-channel": { diff --git a/v2/internal/frontend/runtime/ipc_websocket.js b/v2/internal/frontend/runtime/ipc_websocket.js index d14009671..1e4c330b6 100644 --- a/v2/internal/frontend/runtime/ipc_websocket.js +++ b/v2/internal/frontend/runtime/ipc_websocket.js @@ -1,9 +1,9 @@ (()=>{function j(t){console.log("%c wails dev %c "+t+" ","background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem","background: #009900; color: #fff; border-radius: 0px 3px 3px 0px; padding: 1px; font-size: 0.7rem")}function _(){}var O=t=>t;function G(t){return t()}function nt(){return Object.create(null)}function b(t){t.forEach(G)}function S(t){return typeof t=="function"}function D(t,e){return t!=t?e==e:t!==e||t&&typeof t=="object"||typeof t=="function"}function it(t){return Object.keys(t).length===0}function rt(t,...e){if(t==null)return _;let n=t.subscribe(...e);return n.unsubscribe?()=>n.unsubscribe():n}function ot(t,e,n){t.$$.on_destroy.push(rt(e,n))}var st=typeof window!="undefined",Ot=st?()=>window.performance.now():()=>Date.now(),K=st?t=>requestAnimationFrame(t):_;var F=new Set;function ct(t){F.forEach(e=>{e.c(t)||(F.delete(e),e.f())}),F.size!==0&&K(ct)}function Dt(t){let e;return F.size===0&&K(ct),{promise:new Promise(n=>{F.add(e={c:t,f:n})}),abort(){F.delete(e)}}}var lt=!1;function At(){lt=!0}function Lt(){lt=!1}function Bt(t,e){t.appendChild(e)}function ut(t,e,n){let i=P(t);if(!i.getElementById(e)){let r=L("style");r.id=e,r.textContent=n,at(i,r)}}function P(t){if(!t)return document;let e=t.getRootNode?t.getRootNode():t.ownerDocument;return e.host?e:document}function Jt(t){let e=L("style");return at(P(t),e),e}function at(t,e){Bt(t.head||t,e)}function R(t,e,n){t.insertBefore(e,n||null)}function A(t){t.parentNode.removeChild(t)}function L(t){return document.createElement(t)}function zt(t){return document.createTextNode(t)}function ft(){return zt("")}function dt(t,e,n){n==null?t.removeAttribute(e):t.getAttribute(e)!==n&&t.setAttribute(e,n)}function Tt(t){return Array.from(t.childNodes)}function Ht(t,e,n=!1){let i=document.createEvent("CustomEvent");return i.initCustomEvent(t,n,!1,e),i}var N=new Set,B=0;function qt(t){let e=5381,n=t.length;for(;n--;)e=(e<<5)-e^t.charCodeAt(n);return e>>>0}function ht(t,e,n,i,r,c,s,l=0){let a=16.666/i,o=`{ `;for(let g=0;g<=1;g+=a){let v=e+(n-e)*c(g);o+=g*100+`%{${s(v,1-v)}} `}let y=o+`100% {${s(n,1-n)}} -}`,f=`__svelte_${qt(y)}_${l}`,u=P(t);N.add(u);let h=u.__svelte_stylesheet||(u.__svelte_stylesheet=Jt(t).sheet),p=u.__svelte_rules||(u.__svelte_rules={});p[f]||(p[f]=!0,h.insertRule(`@keyframes ${f} ${y}`,h.cssRules.length));let w=t.style.animation||"";return t.style.animation=`${w?`${w}, `:""}${f} ${i}ms linear ${r}ms 1 both`,B+=1,f}function Gt(t,e){let n=(t.style.animation||"").split(", "),i=n.filter(e?c=>c.indexOf(e)<0:c=>c.indexOf("__svelte")===-1),r=n.length-i.length;r&&(t.style.animation=i.join(", "),B-=r,B||Kt())}function Kt(){K(()=>{B||(N.forEach(t=>{let e=t.__svelte_stylesheet,n=e.cssRules.length;for(;n--;)e.deleteRule(n);t.__svelte_rules={}}),N.clear())})}var pt;function J(t){pt=t}var $=[];var _t=[],z=[],mt=[],Pt=Promise.resolve(),W=!1;function Rt(){W||(W=!0,Pt.then(yt))}function x(t){z.push(t)}var V=!1,U=new Set;function yt(){if(!V){V=!0;do{for(let t=0;t<$.length;t+=1){let e=$[t];J(e),Nt(e.$$)}for(J(null),$.length=0;_t.length;)_t.pop()();for(let t=0;t{k=null})),k}function X(t,e,n){t.dispatchEvent(Ht(`${e?"intro":"outro"}${n}`))}var T=new Set,m;function gt(){m={r:0,c:[],p:m}}function bt(){m.r||b(m.c),m=m.p}function C(t,e){t&&t.i&&(T.delete(t),t.i(e))}function Z(t,e,n,i){if(t&&t.o){if(T.has(t))return;T.add(t),m.c.push(()=>{T.delete(t),i&&(n&&t.d(1),i())}),t.o(e)}}var Vt={duration:0};function Q(t,e,n,i){let r=e(t,n),c=i?0:1,s=null,l=null,a=null;function o(){a&&Gt(t,a)}function y(u,h){let p=u.b-c;return h*=Math.abs(p),{a:c,b:u.b,d:p,duration:h,start:u.start,end:u.start+h,group:u.group}}function f(u){let{delay:h=0,duration:p=300,easing:w=O,tick:g=_,css:v}=r||Vt,q={start:Ot()+h,b:u};u||(q.group=m,m.r+=1),s||l?l=q:(v&&(o(),a=ht(t,c,u,p,h,w,v)),u&&g(0,1),s=y(q,p),x(()=>X(t,u,"start")),Dt(E=>{if(l&&E>l.start&&(s=y(l,p),l=null,X(t,s.b,"start"),v&&(o(),a=ht(t,c,s.b,s.duration,0,w,r.css))),s){if(E>=s.end)g(c=s.b,1-c),X(t,s.b,"end"),l||(s.b?o():--s.group.r||b(s.group.c)),s=null;else if(E>=s.start){let jt=E-s.start;c=s.a+s.d*w(jt/s.duration),g(c,1-c)}}return!!(s||l)}))}return{run(u){S(r)?Wt().then(()=>{r=r(),f(u)}):f(u)},end(){o(),s=l=null}}}var ce=typeof window!="undefined"?window:typeof globalThis!="undefined"?globalThis:global;var le=new Set(["allowfullscreen","allowpaymentrequest","async","autofocus","autoplay","checked","controls","default","defer","disabled","formnovalidate","hidden","ismap","loop","multiple","muted","nomodule","novalidate","open","playsinline","readonly","required","reversed","selected"]);function Ut(t,e,n,i){let{fragment:r,on_mount:c,on_destroy:s,after_update:l}=t.$$;r&&r.m(e,n),i||x(()=>{let a=c.map(G).filter(S);s?s.push(...a):b(a),t.$$.on_mount=[]}),l.forEach(x)}function wt(t,e){let n=t.$$;n.fragment!==null&&(b(n.on_destroy),n.fragment&&n.fragment.d(e),n.on_destroy=n.fragment=null,n.ctx=[])}function Xt(t,e){t.$$.dirty[0]===-1&&($.push(t),Rt(),t.$$.dirty.fill(0)),t.$$.dirty[e/31|0]|=1<{let p=h.length?h[0]:u;return o.ctx&&r(o.ctx[f],o.ctx[f]=p)&&(!o.skip_bound&&o.bound[f]&&o.bound[f](p),y&&Xt(t,f)),u}):[],o.update(),y=!0,b(o.before_update),o.fragment=i?i(o.ctx):!1,e.target){if(e.hydrate){At();let f=Tt(e.target);o.fragment&&o.fragment.l(f),f.forEach(A)}else o.fragment&&o.fragment.c();e.intro&&C(t.$$.fragment),Ut(t,e.target,e.anchor,e.customElement),Lt(),yt()}J(a)}var Zt;typeof HTMLElement=="function"&&(Zt=class extends HTMLElement{constructor(){super();this.attachShadow({mode:"open"})}connectedCallback(){let{on_mount:t}=this.$$;this.$$.on_disconnect=t.map(G).filter(S);for(let e in this.$$.slotted)this.appendChild(this.$$.slotted[e])}attributeChangedCallback(t,e,n){this[t]=n}disconnectedCallback(){b(this.$$.on_disconnect)}$destroy(){wt(this,1),this.$destroy=_}$on(t,e){let n=this.$$.callbacks[t]||(this.$$.callbacks[t]=[]);return n.push(e),()=>{let i=n.indexOf(e);i!==-1&&n.splice(i,1)}}$set(t){this.$$set&&!it(t)&&(this.$$.skip_bound=!0,this.$$set(t),this.$$.skip_bound=!1)}});var Y=class{$destroy(){wt(this,1),this.$destroy=_}$on(e,n){let i=this.$$.callbacks[e]||(this.$$.callbacks[e]=[]);return i.push(n),()=>{let r=i.indexOf(n);r!==-1&&i.splice(r,1)}}$set(e){this.$$set&&!it(e)&&(this.$$.skip_bound=!0,this.$$set(e),this.$$.skip_bound=!1)}};var M=[];function Ft(t,e=_){let n,i=new Set;function r(l){if(D(t,l)&&(t=l,n)){let a=!M.length;for(let o of i)o[1](),M.push(o,t);if(a){for(let o=0;o{i.delete(o),i.size===0&&(n(),n=null)}}return{set:r,update:c,subscribe:s}}var H=Ft(!1);function xt(){H.set(!0)}function Mt(){H.set(!1)}function tt(t,{delay:e=0,duration:n=400,easing:i=O}={}){let r=+getComputedStyle(t).opacity;return{delay:e,duration:n,easing:i,css:c=>`opacity: ${c*r}`}}function Qt(t){ut(t,"svelte-181h7z",`.wails-reconnect-overlay.svelte-181h7z{position:fixed;top:0;left:0;width:100%;height:100%;backdrop-filter:blur(2px) saturate(0%) contrast(50%) brightness(25%);z-index:999999 - }.wails-reconnect-overlay-content.svelte-181h7z{position:relative;top:50%;transform:translateY(-50%);margin:0;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAAA7CAMAAAAEsocZAAAC91BMVEUAAACzQ0PjMjLkMjLZLS7XLS+vJCjkMjKlEx6uGyHjMDGiFx7GJyrAISjUKy3mMzPlMjLjMzOsGyDKJirkMjK6HyXmMjLgMDC6IiLcMjLULC3MJyrRKSy+IibmMzPmMjK7ISXlMjLIJimzHSLkMjKtGiHZLC7BIifgMDCpGSDFIivcLy+yHSKoGR+eFBzNKCvlMjKxHSPkMTKxHSLmMjLKJyq5ICXDJCe6ISXdLzDkMjLmMzPFJSm2HyTlMTLhMDGyHSKUEBmhFx24HyTCJCjHJijjMzOiFh7mMjJ6BhDaLDCuGyOKABjnMzPGJinJJiquHCGEChSmGB/pMzOiFh7VKy3OKCu1HiSvHCLjMTLMKCrBIyeICxWxHCLDIyjSKizBIyh+CBO9ISa6ISWDChS9Iie1HyXVLC7FJSrLKCrlMjLiMTGPDhicFRywGyKXFBuhFx1/BxO7IiXkMTGeFBx8BxLkMTGnGR/GJCi4ICWsGyGJDxXSLS2yGiHSKi3CJCfnMzPQKiyECRTKJiq6ISWUERq/Iye0HiPDJCjGJSm6ICaPDxiTEBrdLy+3HyXSKiy0HyOQEBi4ICWhFh1+CBO9IieODhfSKyzWLC2LDhh8BxHKKCq7ISWaFBzkMzPqNDTTLC3EJSiHDBacExyvGyO1HyTPKCy+IieoGSC7ISaVEhrMKCvQKyusGyG0HiKACBPIJSq/JCaABxR5BRLEJCnkMzPJJinEJimPDRZ2BRKqHx/jMjLnMzPgMDHULC3NKSvQKSzsNDTWLS7SKyy3HyTKJyrDJSjbLzDYLC6mGB/GJSnVLC61HiPLKCrHJSm/Iye8Iia6ICWzHSKxHCLaLi/PKSupGR+7ICXpMzPbLi/IJinJJSmsGyGrGiCkFx6PDheJCxaFChXBIyfAIieSDxmBCBPlMjLeLzDdLzC5HySMDRe+ISWvGyGcFBzSKSzPJyvMJyrEJCjDIyefFRyWERriMDHUKiy/ISaZExv0NjbwNTXuNDTrMzMI0c+yAAAAu3RSTlMAA8HR/gwGgAj+MEpGCsC+hGpjQjYnIxgWBfzx7urizMrFqqB1bF83KhsR/fz8+/r5+fXv7unZ1tC+t6mmopqKdW1nYVpVRjUeHhIQBPr59/b28/Hx8ODg3NvUw8O/vKeim5aNioiDgn1vZWNjX1xUU1JPTUVFPT08Mi4qJyIh/Pv7+/n4+Pf39fT08/Du7efn5uXj4uHa19XNwsG/vrq2tbSuramlnpyYkpGNiIZ+enRraGVjVVBKOzghdjzRsAAABJVJREFUWMPtllVQG1EYhTc0ASpoobS0FCulUHd3oUjd3d3d3d3d3d2b7CYhnkBCCHGDEIK7Vh56d0NpOgwkYfLQzvA9ZrLfnPvfc+8uVEst/yheBJup3Nya2MjU6pa/jWLZtxjXpZFtVB4uVNI6m5gIruNkVFebqIb5Ug2ym4TIEM/gtUOGbg613oBzjAzZFrZ+lXu/3TIiMXXS5M6HTvrNHeLpZLEh6suGNW9fzZ9zd/qVi2eOHygqi5cDE5GUrJocONgzyqo0UXNSUlKSEhMztFqtXq9vNxImAmS3g7Y6QlbjdBWVGW36jt4wDGTUXjUsafh5zJWRkdFuZGtWGnCRmg+HasiGMUClTTzW0ZuVgLlGDIPM4Lhi0IrVq+tv2hS21fNrSONQgpM9DsJ4t3fM9PkvJuKj2ZjrZwvILKvaSTgciUSirjt6dOfOpyd169bDb9rMOwF9Hj4OD100gY0YXYb299bjzMrqj9doNByJWlVXFB9DT5dmJuvy+cq83JyuS6ayEYSHulKL8dmFnBkrCeZlHKMrC5XRhXGCZB2Ty1fkleRQaMCFT2DBsEafzRFJu7/2MicbKynPhQUDLiZwMWLJZKNLzoLbJBYVcurSmbmn+rcyJ8vCMgmlmaW6gnwun/+3C96VpAUuET1ZgRR36r2xWlnYSnf3oKABA14uXDDvydxHs6cpTV1p3hlJ2rJCiUjIZCByItXg8sHJijuvT64CuMTABUYvb6NN1Jdp1PH7D7f3bo2eS5KvW4RJr7atWT5w4MBBg9zdBw9+37BS7QIoFS5WnIaj12dr1DEXFgdvr4fh4eFl+u/wz8uf3jjHic8s4DL2Dal0IANyUBeCRCcwOBJV26JsjSpGwHVuSai69jvqD+jr56OgtKy0zAAK5mLTVBKVKL5tNthGAR9JneJQ/bFsHNzy+U7IlCYROxtMpIjR0ceoQVnowracLLpAQWETqV361bPoFo3cEbz2zYLZM7t3HWXcxmiBOgttS1ycWkTXMWh4mGigdug9DFdttqCFgTN6nD0q1XEVSoCxEjyFCi2eNC6Z69MRVIImJ6JQSf5gcFVCuF+aDhCa1F6MJFDaiNBQAh2TMfWBjhmLsAxUjG/fmjs0qjJck8D0GPBcuUuZW1LS/tIsPzqmQt17PvZQknlwnf4tHDBc+7t5VV3QQCkdc+Ur8/hdrz0but0RCumWiYbiKmLJ7EVbRomj4Q7+y5wsaXvfTGFpQcHB7n2WbG4MGdniw2Tm8xl5Yhr7MrSYHQ3uampz10aWyHyuzxvqaW/6W4MjXAUD3QV2aw97ZxhGjxCohYf5TpTHMXU1BbsAuoFnkRygVieIGAbqiF7rrH4rfWpKJouBCtyHJF8ctEyGubBa+C6NsMYEUonJFITHZqWBxXUA12Dv76Tf/PgOBmeNiiLG1pcKo1HAq8jLpY4JU1yWEixVNaOgoRJAKBSZHTZTU+wJOMtUDZvlVITC6FTlksyrEBoPHXpxxbzdaqzigUtVDkJVIOtVQ9UEOR4VGUh/kHWq0edJ6CxnZ+eePXva2bnY/cF/I1RLLf8vvwDANdMSMegxcAAAAABJRU5ErkJggg==);background-repeat:no-repeat;background-position:center - }.wails-reconnect-overlay-loadingspinner.svelte-181h7z{pointer-events:none;width:2.5em;height:2.5em;border:.4em solid transparent;border-color:#f00 #eee0 #f00 #eee0;border-radius:50%;animation:svelte-181h7z-loadingspin 1s linear infinite;margin:auto;padding:2.5em +}`,f=`__svelte_${qt(y)}_${l}`,u=P(t);N.add(u);let h=u.__svelte_stylesheet||(u.__svelte_stylesheet=Jt(t).sheet),p=u.__svelte_rules||(u.__svelte_rules={});p[f]||(p[f]=!0,h.insertRule(`@keyframes ${f} ${y}`,h.cssRules.length));let w=t.style.animation||"";return t.style.animation=`${w?`${w}, `:""}${f} ${i}ms linear ${r}ms 1 both`,B+=1,f}function Gt(t,e){let n=(t.style.animation||"").split(", "),i=n.filter(e?c=>c.indexOf(e)<0:c=>c.indexOf("__svelte")===-1),r=n.length-i.length;r&&(t.style.animation=i.join(", "),B-=r,B||Kt())}function Kt(){K(()=>{B||(N.forEach(t=>{let e=t.__svelte_stylesheet,n=e.cssRules.length;for(;n--;)e.deleteRule(n);t.__svelte_rules={}}),N.clear())})}var pt;function J(t){pt=t}var $=[];var _t=[],z=[],mt=[],Pt=Promise.resolve(),W=!1;function Rt(){W||(W=!0,Pt.then(yt))}function x(t){z.push(t)}var V=!1,U=new Set;function yt(){if(!V){V=!0;do{for(let t=0;t<$.length;t+=1){let e=$[t];J(e),Nt(e.$$)}for(J(null),$.length=0;_t.length;)_t.pop()();for(let t=0;t{k=null})),k}function X(t,e,n){t.dispatchEvent(Ht(`${e?"intro":"outro"}${n}`))}var T=new Set,m;function gt(){m={r:0,c:[],p:m}}function bt(){m.r||b(m.c),m=m.p}function C(t,e){t&&t.i&&(T.delete(t),t.i(e))}function Z(t,e,n,i){if(t&&t.o){if(T.has(t))return;T.add(t),m.c.push(()=>{T.delete(t),i&&(n&&t.d(1),i())}),t.o(e)}}var Vt={duration:0};function Q(t,e,n,i){let r=e(t,n),c=i?0:1,s=null,l=null,a=null;function o(){a&&Gt(t,a)}function y(u,h){let p=u.b-c;return h*=Math.abs(p),{a:c,b:u.b,d:p,duration:h,start:u.start,end:u.start+h,group:u.group}}function f(u){let{delay:h=0,duration:p=300,easing:w=O,tick:g=_,css:v}=r||Vt,q={start:Ot()+h,b:u};u||(q.group=m,m.r+=1),s||l?l=q:(v&&(o(),a=ht(t,c,u,p,h,w,v)),u&&g(0,1),s=y(q,p),x(()=>X(t,u,"start")),Dt(E=>{if(l&&E>l.start&&(s=y(l,p),l=null,X(t,s.b,"start"),v&&(o(),a=ht(t,c,s.b,s.duration,0,w,r.css))),s){if(E>=s.end)g(c=s.b,1-c),X(t,s.b,"end"),l||(s.b?o():--s.group.r||b(s.group.c)),s=null;else if(E>=s.start){let jt=E-s.start;c=s.a+s.d*w(jt/s.duration),g(c,1-c)}}return!!(s||l)}))}return{run(u){S(r)?Wt().then(()=>{r=r(),f(u)}):f(u)},end(){o(),s=l=null}}}var ce=typeof window!="undefined"?window:typeof globalThis!="undefined"?globalThis:global;var le=new Set(["allowfullscreen","allowpaymentrequest","async","autofocus","autoplay","checked","controls","default","defer","disabled","formnovalidate","hidden","ismap","loop","multiple","muted","nomodule","novalidate","open","playsinline","readonly","required","reversed","selected"]);function Ut(t,e,n,i){let{fragment:r,on_mount:c,on_destroy:s,after_update:l}=t.$$;r&&r.m(e,n),i||x(()=>{let a=c.map(G).filter(S);s?s.push(...a):b(a),t.$$.on_mount=[]}),l.forEach(x)}function wt(t,e){let n=t.$$;n.fragment!==null&&(b(n.on_destroy),n.fragment&&n.fragment.d(e),n.on_destroy=n.fragment=null,n.ctx=[])}function Xt(t,e){t.$$.dirty[0]===-1&&($.push(t),Rt(),t.$$.dirty.fill(0)),t.$$.dirty[e/31|0]|=1<{let p=h.length?h[0]:u;return o.ctx&&r(o.ctx[f],o.ctx[f]=p)&&(!o.skip_bound&&o.bound[f]&&o.bound[f](p),y&&Xt(t,f)),u}):[],o.update(),y=!0,b(o.before_update),o.fragment=i?i(o.ctx):!1,e.target){if(e.hydrate){At();let f=Tt(e.target);o.fragment&&o.fragment.l(f),f.forEach(A)}else o.fragment&&o.fragment.c();e.intro&&C(t.$$.fragment),Ut(t,e.target,e.anchor,e.customElement),Lt(),yt()}J(a)}var Zt;typeof HTMLElement=="function"&&(Zt=class extends HTMLElement{constructor(){super();this.attachShadow({mode:"open"})}connectedCallback(){let{on_mount:t}=this.$$;this.$$.on_disconnect=t.map(G).filter(S);for(let e in this.$$.slotted)this.appendChild(this.$$.slotted[e])}attributeChangedCallback(t,e,n){this[t]=n}disconnectedCallback(){b(this.$$.on_disconnect)}$destroy(){wt(this,1),this.$destroy=_}$on(t,e){let n=this.$$.callbacks[t]||(this.$$.callbacks[t]=[]);return n.push(e),()=>{let i=n.indexOf(e);i!==-1&&n.splice(i,1)}}$set(t){this.$$set&&!it(t)&&(this.$$.skip_bound=!0,this.$$set(t),this.$$.skip_bound=!1)}});var Y=class{$destroy(){wt(this,1),this.$destroy=_}$on(e,n){let i=this.$$.callbacks[e]||(this.$$.callbacks[e]=[]);return i.push(n),()=>{let r=i.indexOf(n);r!==-1&&i.splice(r,1)}}$set(e){this.$$set&&!it(e)&&(this.$$.skip_bound=!0,this.$$set(e),this.$$.skip_bound=!1)}};var M=[];function Ft(t,e=_){let n,i=new Set;function r(l){if(D(t,l)&&(t=l,n)){let a=!M.length;for(let o of i)o[1](),M.push(o,t);if(a){for(let o=0;o{i.delete(o),i.size===0&&(n(),n=null)}}return{set:r,update:c,subscribe:s}}var H=Ft(!1);function xt(){H.set(!0)}function Mt(){H.set(!1)}function tt(t,{delay:e=0,duration:n=400,easing:i=O}={}){let r=+getComputedStyle(t).opacity;return{delay:e,duration:n,easing:i,css:c=>`opacity: ${c*r}`}}function Qt(t){ut(t,"svelte-181h7z",`.wails-reconnect-overlay.svelte-181h7z{position:fixed;top:0;left:0;width:100%;height:100%;backdrop-filter:blur(2px) saturate(0%) contrast(50%) brightness(25%);z-index:999999\r + }.wails-reconnect-overlay-content.svelte-181h7z{position:relative;top:50%;transform:translateY(-50%);margin:0;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAAA7CAMAAAAEsocZAAAC91BMVEUAAACzQ0PjMjLkMjLZLS7XLS+vJCjkMjKlEx6uGyHjMDGiFx7GJyrAISjUKy3mMzPlMjLjMzOsGyDKJirkMjK6HyXmMjLgMDC6IiLcMjLULC3MJyrRKSy+IibmMzPmMjK7ISXlMjLIJimzHSLkMjKtGiHZLC7BIifgMDCpGSDFIivcLy+yHSKoGR+eFBzNKCvlMjKxHSPkMTKxHSLmMjLKJyq5ICXDJCe6ISXdLzDkMjLmMzPFJSm2HyTlMTLhMDGyHSKUEBmhFx24HyTCJCjHJijjMzOiFh7mMjJ6BhDaLDCuGyOKABjnMzPGJinJJiquHCGEChSmGB/pMzOiFh7VKy3OKCu1HiSvHCLjMTLMKCrBIyeICxWxHCLDIyjSKizBIyh+CBO9ISa6ISWDChS9Iie1HyXVLC7FJSrLKCrlMjLiMTGPDhicFRywGyKXFBuhFx1/BxO7IiXkMTGeFBx8BxLkMTGnGR/GJCi4ICWsGyGJDxXSLS2yGiHSKi3CJCfnMzPQKiyECRTKJiq6ISWUERq/Iye0HiPDJCjGJSm6ICaPDxiTEBrdLy+3HyXSKiy0HyOQEBi4ICWhFh1+CBO9IieODhfSKyzWLC2LDhh8BxHKKCq7ISWaFBzkMzPqNDTTLC3EJSiHDBacExyvGyO1HyTPKCy+IieoGSC7ISaVEhrMKCvQKyusGyG0HiKACBPIJSq/JCaABxR5BRLEJCnkMzPJJinEJimPDRZ2BRKqHx/jMjLnMzPgMDHULC3NKSvQKSzsNDTWLS7SKyy3HyTKJyrDJSjbLzDYLC6mGB/GJSnVLC61HiPLKCrHJSm/Iye8Iia6ICWzHSKxHCLaLi/PKSupGR+7ICXpMzPbLi/IJinJJSmsGyGrGiCkFx6PDheJCxaFChXBIyfAIieSDxmBCBPlMjLeLzDdLzC5HySMDRe+ISWvGyGcFBzSKSzPJyvMJyrEJCjDIyefFRyWERriMDHUKiy/ISaZExv0NjbwNTXuNDTrMzMI0c+yAAAAu3RSTlMAA8HR/gwGgAj+MEpGCsC+hGpjQjYnIxgWBfzx7urizMrFqqB1bF83KhsR/fz8+/r5+fXv7unZ1tC+t6mmopqKdW1nYVpVRjUeHhIQBPr59/b28/Hx8ODg3NvUw8O/vKeim5aNioiDgn1vZWNjX1xUU1JPTUVFPT08Mi4qJyIh/Pv7+/n4+Pf39fT08/Du7efn5uXj4uHa19XNwsG/vrq2tbSuramlnpyYkpGNiIZ+enRraGVjVVBKOzghdjzRsAAABJVJREFUWMPtllVQG1EYhTc0ASpoobS0FCulUHd3oUjd3d3d3d3d3d2b7CYhnkBCCHGDEIK7Vh56d0NpOgwkYfLQzvA9ZrLfnPvfc+8uVEst/yheBJup3Nya2MjU6pa/jWLZtxjXpZFtVB4uVNI6m5gIruNkVFebqIb5Ug2ym4TIEM/gtUOGbg613oBzjAzZFrZ+lXu/3TIiMXXS5M6HTvrNHeLpZLEh6suGNW9fzZ9zd/qVi2eOHygqi5cDE5GUrJocONgzyqo0UXNSUlKSEhMztFqtXq9vNxImAmS3g7Y6QlbjdBWVGW36jt4wDGTUXjUsafh5zJWRkdFuZGtWGnCRmg+HasiGMUClTTzW0ZuVgLlGDIPM4Lhi0IrVq+tv2hS21fNrSONQgpM9DsJ4t3fM9PkvJuKj2ZjrZwvILKvaSTgciUSirjt6dOfOpyd169bDb9rMOwF9Hj4OD100gY0YXYb299bjzMrqj9doNByJWlVXFB9DT5dmJuvy+cq83JyuS6ayEYSHulKL8dmFnBkrCeZlHKMrC5XRhXGCZB2Ty1fkleRQaMCFT2DBsEafzRFJu7/2MicbKynPhQUDLiZwMWLJZKNLzoLbJBYVcurSmbmn+rcyJ8vCMgmlmaW6gnwun/+3C96VpAUuET1ZgRR36r2xWlnYSnf3oKABA14uXDDvydxHs6cpTV1p3hlJ2rJCiUjIZCByItXg8sHJijuvT64CuMTABUYvb6NN1Jdp1PH7D7f3bo2eS5KvW4RJr7atWT5w4MBBg9zdBw9+37BS7QIoFS5WnIaj12dr1DEXFgdvr4fh4eFl+u/wz8uf3jjHic8s4DL2Dal0IANyUBeCRCcwOBJV26JsjSpGwHVuSai69jvqD+jr56OgtKy0zAAK5mLTVBKVKL5tNthGAR9JneJQ/bFsHNzy+U7IlCYROxtMpIjR0ceoQVnowracLLpAQWETqV361bPoFo3cEbz2zYLZM7t3HWXcxmiBOgttS1ycWkTXMWh4mGigdug9DFdttqCFgTN6nD0q1XEVSoCxEjyFCi2eNC6Z69MRVIImJ6JQSf5gcFVCuF+aDhCa1F6MJFDaiNBQAh2TMfWBjhmLsAxUjG/fmjs0qjJck8D0GPBcuUuZW1LS/tIsPzqmQt17PvZQknlwnf4tHDBc+7t5VV3QQCkdc+Ur8/hdrz0but0RCumWiYbiKmLJ7EVbRomj4Q7+y5wsaXvfTGFpQcHB7n2WbG4MGdniw2Tm8xl5Yhr7MrSYHQ3uampz10aWyHyuzxvqaW/6W4MjXAUD3QV2aw97ZxhGjxCohYf5TpTHMXU1BbsAuoFnkRygVieIGAbqiF7rrH4rfWpKJouBCtyHJF8ctEyGubBa+C6NsMYEUonJFITHZqWBxXUA12Dv76Tf/PgOBmeNiiLG1pcKo1HAq8jLpY4JU1yWEixVNaOgoRJAKBSZHTZTU+wJOMtUDZvlVITC6FTlksyrEBoPHXpxxbzdaqzigUtVDkJVIOtVQ9UEOR4VGUh/kHWq0edJ6CxnZ+eePXva2bnY/cF/I1RLLf8vvwDANdMSMegxcAAAAABJRU5ErkJggg==);background-repeat:no-repeat;background-position:center\r + }.wails-reconnect-overlay-loadingspinner.svelte-181h7z{pointer-events:none;width:2.5em;height:2.5em;border:.4em solid transparent;border-color:#f00 #eee0 #f00 #eee0;border-radius:50%;animation:svelte-181h7z-loadingspin 1s linear infinite;margin:auto;padding:2.5em\r }@keyframes svelte-181h7z-loadingspin{100%{transform:rotate(360deg)}}`)}function St(t){let e,n,i;return{c(){e=L("div"),e.innerHTML='
',dt(e,"class","wails-reconnect-overlay svelte-181h7z")},m(r,c){R(r,e,c),i=!0},i(r){i||(x(()=>{n||(n=Q(e,tt,{duration:300},!0)),n.run(1)}),i=!0)},o(r){n||(n=Q(e,tt,{duration:300},!1)),n.run(0),i=!1},d(r){r&&A(e),r&&n&&n.end()}}}function Yt(t){let e,n,i=t[0]&&St(t);return{c(){i&&i.c(),e=ft()},m(r,c){i&&i.m(r,c),R(r,e,c),n=!0},p(r,[c]){r[0]?i?c&1&&C(i,1):(i=St(r),i.c(),C(i,1),i.m(e.parentNode,e)):i&&(gt(),Z(i,1,1,()=>{i=null}),bt())},i(r){n||(C(i),n=!0)},o(r){Z(i),n=!1},d(r){i&&i.d(r),r&&A(e)}}}function te(t,e,n){let i;return ot(t,H,r=>n(0,i=r)),[i]}var $t=class extends Y{constructor(e){super();vt(this,e,te,Yt,D,{},Qt)}},kt=$t;var ee={},et=null,I=[];window.WailsInvoke=t=>{if(!et){console.log("Queueing: "+t),I.push(t);return}et(t)};window.addEventListener("DOMContentLoaded",()=>{ee.overlay=new kt({target:document.body,anchor:document.querySelector("#wails-spinner")})});var d=null,Ct;window.onbeforeunload=function(){d&&(d.onclose=function(){},d.close(),d=null)};Et();function ne(){et=t=>{d.send(t)};for(let t=0;t WindowMinimise, WindowReload: () => WindowReload, WindowReloadApp: () => WindowReloadApp, + WindowSetAlwaysOnTop: () => WindowSetAlwaysOnTop, + WindowSetBackgroundColour: () => WindowSetBackgroundColour, WindowSetDarkTheme: () => WindowSetDarkTheme, WindowSetLightTheme: () => WindowSetLightTheme, WindowSetMaxSize: () => WindowSetMaxSize, WindowSetMinSize: () => WindowSetMinSize, WindowSetPosition: () => WindowSetPosition, - WindowSetRGBA: () => WindowSetRGBA, WindowSetSize: () => WindowSetSize, WindowSetSystemDefaultTheme: () => WindowSetSystemDefaultTheme, WindowSetTitle: () => WindowSetTitle, @@ -290,6 +291,9 @@ function WindowSetMinSize(width, height) { window.WailsInvoke("Wz:" + width + ":" + height); } + function WindowSetAlwaysOnTop(b) { + window.WailsInvoke("WATP:" + (b ? "1" : "0")); + } function WindowSetPosition(x, y) { window.WailsInvoke("Wp:" + x + ":" + y); } @@ -305,20 +309,25 @@ function WindowMaximise() { window.WailsInvoke("WM"); } + function WindowToggleMaximise() { window.WailsInvoke("Wt"); } + function WindowUnmaximise() { window.WailsInvoke("WU"); } + function WindowMinimise() { window.WailsInvoke("Wm"); } + function WindowUnminimise() { window.WailsInvoke("Wu"); } - function WindowSetRGBA(R, G, B, A) { - let rgba = JSON.stringify({ r: R || 0, g: G || 0, b: B || 0, a: A || 255 }); + + function WindowSetBackgroundColour(R, G, B, A) { + let rgba = JSON.stringify({r: R || 0, g: G || 0, b: B || 0, a: A || 255}); window.WailsInvoke("Wr:" + rgba); } @@ -327,6 +336,7 @@ __export(browser_exports, { BrowserOpenURL: () => BrowserOpenURL }); + function BrowserOpenURL(url) { window.WailsInvoke("BO:" + url); } @@ -446,4 +456,4 @@ } }); })(); -//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["desktop/log.js", "desktop/events.js", "desktop/calls.js", "desktop/bindings.js", "desktop/window.js", "desktop/browser.js", "desktop/main.js"],
  "sourcesContent": ["/*\n _       __      _ __\n| |     / /___ _(_) /____\n| | /| / / __ `/ / / ___/\n| |/ |/ / /_/ / / (__  )\n|__/|__/\\__,_/_/_/____/\nThe electron alternative for Go\n(c) Lea Anthony 2019-present\n*/\n\n/* jshint esversion: 6 */\n\n/**\n * Sends a log message to the backend with the given level + message\n *\n * @param {string} level\n * @param {string} message\n */\nfunction sendLogMessage(level, message) {\n\n\t// Log Message format:\n\t// l[type][message]\n\twindow.WailsInvoke('L' + level + message);\n}\n\n/**\n * Log the given trace message with the backend\n *\n * @export\n * @param {string} message\n */\nexport function LogTrace(message) {\n\tsendLogMessage('T', message);\n}\n\n/**\n * Log the given message with the backend\n *\n * @export\n * @param {string} message\n */\nexport function LogPrint(message) {\n\tsendLogMessage('P', message);\n}\n\n/**\n * Log the given debug message with the backend\n *\n * @export\n * @param {string} message\n */\nexport function LogDebug(message) {\n\tsendLogMessage('D', message);\n}\n\n/**\n * Log the given info message with the backend\n *\n * @export\n * @param {string} message\n */\nexport function LogInfo(message) {\n\tsendLogMessage('I', message);\n}\n\n/**\n * Log the given warning message with the backend\n *\n * @export\n * @param {string} message\n */\nexport function LogWarning(message) {\n\tsendLogMessage('W', message);\n}\n\n/**\n * Log the given error message with the backend\n *\n * @export\n * @param {string} message\n */\nexport function LogError(message) {\n\tsendLogMessage('E', message);\n}\n\n/**\n * Log the given fatal message with the backend\n *\n * @export\n * @param {string} message\n */\nexport function LogFatal(message) {\n\tsendLogMessage('F', message);\n}\n\n/**\n * Sets the Log level to the given log level\n *\n * @export\n * @param {number} loglevel\n */\nexport function SetLogLevel(loglevel) {\n\tsendLogMessage('S', loglevel);\n}\n\n// Log levels\nexport const LogLevel = {\n\tTRACE: 1,\n\tDEBUG: 2,\n\tINFO: 3,\n\tWARNING: 4,\n\tERROR: 5,\n};\n", "/*\n _       __      _ __\n| |     / /___ _(_) /____\n| | /| / / __ `/ / / ___/\n| |/ |/ / /_/ / / (__  )\n|__/|__/\\__,_/_/_/____/\nThe electron alternative for Go\n(c) Lea Anthony 2019-present\n*/\n/* jshint esversion: 6 */\n\n// Defines a single listener with a maximum number of times to callback\n\n/**\n * The Listener class defines a listener! :-)\n *\n * @class Listener\n */\nclass Listener {\n    /**\n     * Creates an instance of Listener.\n     * @param {function} callback\n     * @param {number} maxCallbacks\n     * @memberof Listener\n     */\n    constructor(callback, maxCallbacks) {\n        // Default of -1 means infinite\n        maxCallbacks = maxCallbacks || -1;\n        // Callback invokes the callback with the given data\n        // Returns true if this listener should be destroyed\n        this.Callback = (data) => {\n            callback.apply(null, data);\n            // If maxCallbacks is infinite, return false (do not destroy)\n            if (maxCallbacks === -1) {\n                return false;\n            }\n            // Decrement maxCallbacks. Return true if now 0, otherwise false\n            maxCallbacks -= 1;\n            return maxCallbacks === 0;\n        };\n    }\n}\n\nexport const eventListeners = {};\n\n/**\n * Registers an event listener that will be invoked `maxCallbacks` times before being destroyed\n *\n * @export\n * @param {string} eventName\n * @param {function} callback\n * @param {number} maxCallbacks\n */\nexport function EventsOnMultiple(eventName, callback, maxCallbacks) {\n    eventListeners[eventName] = eventListeners[eventName] || [];\n    const thisListener = new Listener(callback, maxCallbacks);\n    eventListeners[eventName].push(thisListener);\n}\n\n/**\n * Registers an event listener that will be invoked every time the event is emitted\n *\n * @export\n * @param {string} eventName\n * @param {function} callback\n */\nexport function EventsOn(eventName, callback) {\n    EventsOnMultiple(eventName, callback, -1);\n}\n\n/**\n * Registers an event listener that will be invoked once then destroyed\n *\n * @export\n * @param {string} eventName\n * @param {function} callback\n */\nexport function EventsOnce(eventName, callback) {\n    EventsOnMultiple(eventName, callback, 1);\n}\n\nfunction notifyListeners(eventData) {\n\n    // Get the event name\n    let eventName = eventData.name;\n\n    // Check if we have any listeners for this event\n    if (eventListeners[eventName]) {\n\n        // Keep a list of listener indexes to destroy\n        const newEventListenerList = eventListeners[eventName].slice();\n\n        // Iterate listeners\n        for (let count = 0; count < eventListeners[eventName].length; count += 1) {\n\n            // Get next listener\n            const listener = eventListeners[eventName][count];\n\n            let data = eventData.data;\n\n            // Do the callback\n            const destroy = listener.Callback(data);\n            if (destroy) {\n                // if the listener indicated to destroy itself, add it to the destroy list\n                newEventListenerList.splice(count, 1);\n            }\n        }\n\n        // Update callbacks with new list of listeners\n        eventListeners[eventName] = newEventListenerList;\n    }\n}\n\n/**\n * Notify informs frontend listeners that an event was emitted with the given data\n *\n * @export\n * @param {string} notifyMessage - encoded notification message\n\n */\nexport function EventsNotify(notifyMessage) {\n    // Parse the message\n    let message;\n    try {\n        message = JSON.parse(notifyMessage);\n    } catch (e) {\n        const error = 'Invalid JSON passed to Notify: ' + notifyMessage;\n        throw new Error(error);\n    }\n    notifyListeners(message);\n}\n\n/**\n * Emit an event with the given name and data\n *\n * @export\n * @param {string} eventName\n */\nexport function EventsEmit(eventName) {\n\n    const payload = {\n        name: eventName,\n        data: [].slice.apply(arguments).slice(1),\n    };\n\n    // Notify JS listeners\n    notifyListeners(payload);\n\n    // Notify Go listeners\n    window.WailsInvoke('EE' + JSON.stringify(payload));\n}\n\nexport function EventsOff(eventName) {\n    // Remove local listeners\n    delete eventListeners[eventName];\n\n    // Notify Go listeners\n    window.WailsInvoke('EX' + eventName);\n}", "/*\n _       __      _ __\n| |     / /___ _(_) /____\n| | /| / / __ `/ / / ___/\n| |/ |/ / /_/ / / (__  )\n|__/|__/\\__,_/_/_/____/\nThe electron alternative for Go\n(c) Lea Anthony 2019-present\n*/\n/* jshint esversion: 6 */\n\nexport const callbacks = {};\n\n/**\n * Returns a number from the native browser random function\n *\n * @returns number\n */\nfunction cryptoRandom() {\n\tvar array = new Uint32Array(1);\n\treturn window.crypto.getRandomValues(array)[0];\n}\n\n/**\n * Returns a number using da old-skool Math.Random\n * I likes to call it LOLRandom\n *\n * @returns number\n */\nfunction basicRandom() {\n\treturn Math.random() * 9007199254740991;\n}\n\n// Pick a random number function based on browser capability\nvar randomFunc;\nif (window.crypto) {\n\trandomFunc = cryptoRandom;\n} else {\n\trandomFunc = basicRandom;\n}\n\n\n/**\n * Call sends a message to the backend to call the binding with the\n * given data. A promise is returned and will be completed when the\n * backend responds. This will be resolved when the call was successful\n * or rejected if an error is passed back.\n * There is a timeout mechanism. If the call doesn't respond in the given\n * time (in milliseconds) then the promise is rejected.\n *\n * @export\n * @param {string} name\n * @param {any=} args\n * @param {number=} timeout\n * @returns\n */\nexport function Call(name, args, timeout) {\n\n\t// Timeout infinite by default\n\tif (timeout == null) {\n\t\ttimeout = 0;\n\t}\n\n\t// Create a promise\n\treturn new Promise(function (resolve, reject) {\n\n\t\t// Create a unique callbackID\n\t\tvar callbackID;\n\t\tdo {\n\t\t\tcallbackID = name + '-' + randomFunc();\n\t\t} while (callbacks[callbackID]);\n\n\t\tvar timeoutHandle;\n\t\t// Set timeout\n\t\tif (timeout > 0) {\n\t\t\ttimeoutHandle = setTimeout(function () {\n\t\t\t\treject(Error('Call to ' + name + ' timed out. Request ID: ' + callbackID));\n\t\t\t}, timeout);\n\t\t}\n\n\t\t// Store callback\n\t\tcallbacks[callbackID] = {\n\t\t\ttimeoutHandle: timeoutHandle,\n\t\t\treject: reject,\n\t\t\tresolve: resolve\n\t\t};\n\n\t\ttry {\n\t\t\tconst payload = {\n\t\t\t\tname,\n\t\t\t\targs,\n\t\t\t\tcallbackID,\n\t\t\t};\n\n\t\t\t// Make the call\n\t\t\twindow.WailsInvoke('C' + JSON.stringify(payload));\n\t\t} catch (e) {\n\t\t\t// eslint-disable-next-line\n\t\t\tconsole.error(e);\n\t\t}\n\t});\n}\n\n\n\n/**\n * Called by the backend to return data to a previously called\n * binding invocation\n *\n * @export\n * @param {string} incomingMessage\n */\nexport function Callback(incomingMessage) {\n\t// Parse the message\n\tlet message;\n\ttry {\n\t\tmessage = JSON.parse(incomingMessage);\n\t} catch (e) {\n\t\tconst error = `Invalid JSON passed to callback: ${e.message}. Message: ${incomingMessage}`;\n\t\truntime.LogDebug(error);\n\t\tthrow new Error(error);\n\t}\n\tlet callbackID = message.callbackid;\n\tlet callbackData = callbacks[callbackID];\n\tif (!callbackData) {\n\t\tconst error = `Callback '${callbackID}' not registered!!!`;\n\t\tconsole.error(error); // eslint-disable-line\n\t\tthrow new Error(error);\n\t}\n\tclearTimeout(callbackData.timeoutHandle);\n\n\tdelete callbacks[callbackID];\n\n\tif (message.error) {\n\t\tcallbackData.reject(message.error);\n\t} else {\n\t\tcallbackData.resolve(message.result);\n\t}\n}\n", "/*\n _       __      _ __    \n| |     / /___ _(_) /____\n| | /| / / __ `/ / / ___/\n| |/ |/ / /_/ / / (__  ) \n|__/|__/\\__,_/_/_/____/  \nThe electron alternative for Go\n(c) Lea Anthony 2019-present\n*/\n/* jshint esversion: 6 */\n\nimport {Call} from './calls';\n\n// This is where we bind go method wrappers\nwindow.go = {};\n\nexport function SetBindings(bindingsMap) {\n\ttry {\n\t\tbindingsMap = JSON.parse(bindingsMap);\n\t} catch (e) {\n\t\tconsole.error(e);\n\t}\n\n\t// Initialise the bindings map\n\twindow.go = window.go || {};\n\n\t// Iterate package names\n\tObject.keys(bindingsMap).forEach((packageName) => {\n\n\t\t// Create inner map if it doesn't exist\n\t\twindow.go[packageName] = window.go[packageName] || {};\n\n\t\t// Iterate struct names\n\t\tObject.keys(bindingsMap[packageName]).forEach((structName) => {\n\n\t\t\t// Create inner map if it doesn't exist\n\t\t\twindow.go[packageName][structName] = window.go[packageName][structName] || {};\n\n\t\t\tObject.keys(bindingsMap[packageName][structName]).forEach((methodName) => {\n\n\t\t\t\twindow.go[packageName][structName][methodName] = function () {\n\n\t\t\t\t\t// No timeout by default\n\t\t\t\t\tlet timeout = 0;\n\n\t\t\t\t\t// Actual function\n\t\t\t\t\tfunction dynamic() {\n\t\t\t\t\t\tconst args = [].slice.call(arguments);\n\t\t\t\t\t\treturn Call([packageName, structName, methodName].join('.'), args, timeout);\n\t\t\t\t\t}\n\n\t\t\t\t\t// Allow setting timeout to function\n\t\t\t\t\tdynamic.setTimeout = function (newTimeout) {\n\t\t\t\t\t\ttimeout = newTimeout;\n\t\t\t\t\t};\n\n\t\t\t\t\t// Allow getting timeout to function\n\t\t\t\t\tdynamic.getTimeout = function () {\n\t\t\t\t\t\treturn timeout;\n\t\t\t\t\t};\n\n\t\t\t\t\treturn dynamic;\n\t\t\t\t}();\n\t\t\t});\n\t\t});\n\t});\n}\n", "/*\n _\t   __\t  _ __\n| |\t / /___ _(_) /____\n| | /| / / __ `/ / / ___/\n| |/ |/ / /_/ / / (__  )\n|__/|__/\\__,_/_/_/____/\nThe electron alternative for Go\n(c) Lea Anthony 2019-present\n*/\n\n/* jshint esversion: 9 */\n\n\nimport {Call} from \"./calls\";\n\nexport function WindowReload() {\n    window.location.reload();\n}\n\nexport function WindowReloadApp() {\n    window.WailsInvoke('WR');\n}\n\nexport function WindowSetSystemDefaultTheme() {\n    window.WailsInvoke('WASDT');\n}\n\nexport function WindowSetLightTheme() {\n    window.WailsInvoke('WALT');\n}\n\nexport function WindowSetDarkTheme() {\n    window.WailsInvoke('WADT');\n}\n\n/**\n * Place the window in the center of the screen\n *\n * @export\n */\nexport function WindowCenter() {\n    window.WailsInvoke('Wc');\n}\n\n/**\n * Sets the window title\n *\n * @param {string} title\n * @export\n */\nexport function WindowSetTitle(title) {\n    window.WailsInvoke('WT' + title);\n}\n\n/**\n * Makes the window go fullscreen\n *\n * @export\n */\nexport function WindowFullscreen() {\n    window.WailsInvoke('WF');\n}\n\n/**\n * Reverts the window from fullscreen\n *\n * @export\n */\nexport function WindowUnfullscreen() {\n    window.WailsInvoke('Wf');\n}\n\n/**\n * Set the Size of the window\n *\n * @export\n * @param {number} width\n * @param {number} height\n */\nexport function WindowSetSize(width, height) {\n    window.WailsInvoke('Ws:' + width + ':' + height);\n}\n\n/**\n * Get the Size of the window\n *\n * @export\n * @return {Promise<{w: number, h: number}>} The size of the window\n\n */\nexport function WindowGetSize() {\n    return Call(\":wails:WindowGetSize\");\n}\n\n/**\n * Set the maximum size of the window\n *\n * @export\n * @param {number} width\n * @param {number} height\n */\nexport function WindowSetMaxSize(width, height) {\n    window.WailsInvoke('WZ:' + width + ':' + height);\n}\n\n/**\n * Set the minimum size of the window\n *\n * @export\n * @param {number} width\n * @param {number} height\n */\nexport function WindowSetMinSize(width, height) {\n    window.WailsInvoke('Wz:' + width + ':' + height);\n}\n\n/**\n * Set the Position of the window\n *\n * @export\n * @param {number} x\n * @param {number} y\n */\nexport function WindowSetPosition(x, y) {\n    window.WailsInvoke('Wp:' + x + ':' + y);\n}\n\n/**\n * Get the Position of the window\n *\n * @export\n * @return {Promise<{x: number, y: number}>} The position of the window\n */\nexport function WindowGetPosition() {\n    return Call(\":wails:WindowGetPos\");\n}\n\n/**\n * Hide the Window\n *\n * @export\n */\nexport function WindowHide() {\n    window.WailsInvoke('WH');\n}\n\n/**\n * Show the Window\n *\n * @export\n */\nexport function WindowShow() {\n    window.WailsInvoke('WS');\n}\n\n/**\n * Maximise the Window\n *\n * @export\n */\nexport function WindowMaximise() {\n    window.WailsInvoke('WM');\n}\n\n/**\n * Toggle the Maximise of the Window\n *\n * @export\n */\nexport function WindowToggleMaximise() {\n    window.WailsInvoke('Wt');\n}\n\n/**\n * Unmaximise the Window\n *\n * @export\n */\nexport function WindowUnmaximise() {\n    window.WailsInvoke('WU');\n}\n\n/**\n * Minimise the Window\n *\n * @export\n */\nexport function WindowMinimise() {\n    window.WailsInvoke('Wm');\n}\n\n/**\n * Unminimise the Window\n *\n * @export\n */\nexport function WindowUnminimise() {\n    window.WailsInvoke('Wu');\n}\n\n\n/**\n * Sets the background colour of the window\n *\n * @export\n * @param {number} R Red\n * @param {number} G Green\n * @param {number} B Blue\n * @param {number} A Alpha\n */\nexport function WindowSetRGBA(R, G, B, A) {\n    let rgba = JSON.stringify({r: R || 0, g: G || 0, b: B || 0, a: A || 255});\n    window.WailsInvoke('Wr:' + rgba);\n}\n\n", "/**\n * @description: Use the system default browser to open the url\n * @param {string} url \n * @return {void}\n */\nexport function BrowserOpenURL(url) {\n  window.WailsInvoke('BO:' + url);\n}", "/*\n _\t   __\t  _ __\n| |\t / /___ _(_) /____\n| | /| / / __ `/ / / ___/\n| |/ |/ / /_/ / / (__  )\n|__/|__/\\__,_/_/_/____/\nThe electron alternative for Go\n(c) Lea Anthony 2019-present\n*/\n/* jshint esversion: 9 */\nimport * as Log from './log';\nimport {eventListeners, EventsEmit, EventsNotify, EventsOff, EventsOn, EventsOnce, EventsOnMultiple} from './events';\nimport {Call, Callback, callbacks} from './calls';\nimport {SetBindings} from \"./bindings\";\nimport * as Window from \"./window\";\nimport * as Browser from \"./browser\";\n\n\nexport function Quit() {\n    window.WailsInvoke('Q');\n}\n\nexport function Environment() {\n    return Call(\":wails:Environment\");\n}\n\n// The JS runtime\nwindow.runtime = {\n    ...Log,\n    ...Window,\n    ...Browser,\n    EventsOn,\n    EventsOnce,\n    EventsOnMultiple,\n    EventsEmit,\n    EventsOff,\n    Environment,\n    Quit\n};\n\n// Internal wails endpoints\nwindow.wails = {\n    Callback,\n    EventsNotify,\n    SetBindings,\n    eventListeners,\n    callbacks,\n    flags: {\n        disableScrollbarDrag: false,\n        disableWailsDefaultContextMenu: false,\n        enableResize: false,\n        defaultCursor: null,\n        borderThickness: 6,\n        dbClickInterval: 100,\n    }\n};\n\n// Set the bindings\nwindow.wails.SetBindings(window.wailsbindings);\ndelete window.wails.SetBindings;\n\n// This is evaluated at build time in package.json\n// const dev = 0;\n// const production = 1;\nif (ENV === 0) {\n    delete window.wailsbindings;\n}\n\nvar dragTimeOut;\nvar dragLastTime = 0;\n\nfunction drag() {\n    window.WailsInvoke(\"drag\");\n}\n\n// Setup drag handler\n// Based on code from: https://github.com/patr0nus/DeskGap\nwindow.addEventListener('mousedown', (e) => {\n\n    // Check for resizing\n    if (window.wails.flags.resizeEdge) {\n        window.WailsInvoke(\"resize:\" + window.wails.flags.resizeEdge);\n        e.preventDefault();\n        return;\n    }\n\n    // Check for dragging\n    let currentElement = e.target;\n    while (currentElement != null) {\n        if (currentElement.hasAttribute('data-wails-no-drag')) {\n            break;\n        } else if (currentElement.hasAttribute('data-wails-drag')) {\n            if (window.wails.flags.disableScrollbarDrag) {\n                // This checks for clicks on the scroll bar\n                if (e.offsetX > e.target.clientWidth || e.offsetY > e.target.clientHeight) {\n                    break;\n                }\n            }\n            if (new Date().getTime() - dragLastTime < window.wails.flags.dbClickInterval) {\n                clearTimeout(dragTimeOut);\n                break;\n            }\n            dragTimeOut = setTimeout(drag, window.wails.flags.dbClickInterval);\n            dragLastTime = new Date().getTime();\n            e.preventDefault();\n            break;\n        }\n        currentElement = currentElement.parentElement;\n    }\n});\n\nfunction setResize(cursor) {\n    document.body.style.cursor = cursor || window.wails.flags.defaultCursor;\n    window.wails.flags.resizeEdge = cursor;\n}\n\nwindow.addEventListener('mousemove', function (e) {\n    if (!window.wails.flags.enableResize) {\n        return;\n    }\n    if (window.wails.flags.defaultCursor == null) {\n        window.wails.flags.defaultCursor = document.body.style.cursor;\n    }\n    if (window.outerWidth - e.clientX < window.wails.flags.borderThickness && window.outerHeight - e.clientY < window.wails.flags.borderThickness) {\n        document.body.style.cursor = \"se-resize\";\n    }\n    let rightBorder = window.outerWidth - e.clientX < window.wails.flags.borderThickness;\n    let leftBorder = e.clientX < window.wails.flags.borderThickness;\n    let topBorder = e.clientY < window.wails.flags.borderThickness;\n    let bottomBorder = window.outerHeight - e.clientY < window.wails.flags.borderThickness;\n\n    // If we aren't on an edge, but were, reset the cursor to default\n    if (!leftBorder && !rightBorder && !topBorder && !bottomBorder && window.wails.flags.resizeEdge !== undefined) {\n        setResize();\n    } else if (rightBorder && bottomBorder) setResize(\"se-resize\");\n    else if (leftBorder && bottomBorder) setResize(\"sw-resize\");\n    else if (leftBorder && topBorder) setResize(\"nw-resize\");\n    else if (topBorder && rightBorder) setResize(\"ne-resize\");\n    else if (leftBorder) setResize(\"w-resize\");\n    else if (topBorder) setResize(\"n-resize\");\n    else if (bottomBorder) setResize(\"s-resize\");\n    else if (rightBorder) setResize(\"e-resize\");\n\n});\n\n// Setup context menu hook\nwindow.addEventListener('contextmenu', function (e) {\n    if (window.wails.flags.disableWailsDefaultContextMenu) {\n        e.preventDefault();\n    }\n});"],
  "mappings": ";;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAkBA,0BAAwB,OAAO,SAAS;AAIvC,WAAO,YAAY,MAAM,QAAQ;AAAA;AAS3B,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,mBAAiB,SAAS;AAChC,mBAAe,KAAK;AAAA;AASd,sBAAoB,SAAS;AACnC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,uBAAqB,UAAU;AACrC,mBAAe,KAAK;AAAA;AAId,MAAM,WAAW;AAAA,IACvB,OAAO;AAAA,IACP,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA;;;AC7FR,uBAAe;AAAA,IAOX,YAAY,UAAU,cAAc;AAEhC,qBAAe,gBAAgB;AAG/B,WAAK,WAAW,CAAC,SAAS;AACtB,iBAAS,MAAM,MAAM;AAErB,YAAI,iBAAiB,IAAI;AACrB,iBAAO;AAAA;AAGX,wBAAgB;AAChB,eAAO,iBAAiB;AAAA;AAAA;AAAA;AAK7B,MAAM,iBAAiB;AAUvB,4BAA0B,WAAW,UAAU,cAAc;AAChE,mBAAe,aAAa,eAAe,cAAc;AACzD,UAAM,eAAe,IAAI,SAAS,UAAU;AAC5C,mBAAe,WAAW,KAAK;AAAA;AAU5B,oBAAkB,WAAW,UAAU;AAC1C,qBAAiB,WAAW,UAAU;AAAA;AAUnC,sBAAoB,WAAW,UAAU;AAC5C,qBAAiB,WAAW,UAAU;AAAA;AAG1C,2BAAyB,WAAW;AAGhC,QAAI,YAAY,UAAU;AAG1B,QAAI,eAAe,YAAY;AAG3B,YAAM,uBAAuB,eAAe,WAAW;AAGvD,eAAS,QAAQ,GAAG,QAAQ,eAAe,WAAW,QAAQ,SAAS,GAAG;AAGtE,cAAM,WAAW,eAAe,WAAW;AAE3C,YAAI,OAAO,UAAU;AAGrB,cAAM,UAAU,SAAS,SAAS;AAClC,YAAI,SAAS;AAET,+BAAqB,OAAO,OAAO;AAAA;AAAA;AAK3C,qBAAe,aAAa;AAAA;AAAA;AAW7B,wBAAsB,eAAe;AAExC,QAAI;AACJ,QAAI;AACA,gBAAU,KAAK,MAAM;AAAA,aAChB,GAAP;AACE,YAAM,QAAQ,oCAAoC;AAClD,YAAM,IAAI,MAAM;AAAA;AAEpB,oBAAgB;AAAA;AASb,sBAAoB,WAAW;AAElC,UAAM,UAAU;AAAA,MACZ,MAAM;AAAA,MACN,MAAM,GAAG,MAAM,MAAM,WAAW,MAAM;AAAA;AAI1C,oBAAgB;AAGhB,WAAO,YAAY,OAAO,KAAK,UAAU;AAAA;AAGtC,qBAAmB,WAAW;AAEjC,WAAO,eAAe;AAGtB,WAAO,YAAY,OAAO;AAAA;;;AClJvB,MAAM,YAAY;AAOzB,0BAAwB;AACvB,QAAI,QAAQ,IAAI,YAAY;AAC5B,WAAO,OAAO,OAAO,gBAAgB,OAAO;AAAA;AAS7C,yBAAuB;AACtB,WAAO,KAAK,WAAW;AAAA;AAIxB,MAAI;AACJ,MAAI,OAAO,QAAQ;AAClB,iBAAa;AAAA,SACP;AACN,iBAAa;AAAA;AAkBP,gBAAc,MAAM,MAAM,SAAS;AAGzC,QAAI,WAAW,MAAM;AACpB,gBAAU;AAAA;AAIX,WAAO,IAAI,QAAQ,SAAU,SAAS,QAAQ;AAG7C,UAAI;AACJ,SAAG;AACF,qBAAa,OAAO,MAAM;AAAA,eAClB,UAAU;AAEnB,UAAI;AAEJ,UAAI,UAAU,GAAG;AAChB,wBAAgB,WAAW,WAAY;AACtC,iBAAO,MAAM,aAAa,OAAO,6BAA6B;AAAA,WAC5D;AAAA;AAIJ,gBAAU,cAAc;AAAA,QACvB;AAAA,QACA;AAAA,QACA;AAAA;AAGD,UAAI;AACH,cAAM,UAAU;AAAA,UACf;AAAA,UACA;AAAA,UACA;AAAA;AAID,eAAO,YAAY,MAAM,KAAK,UAAU;AAAA,eAChC,GAAP;AAED,gBAAQ,MAAM;AAAA;AAAA;AAAA;AAcV,oBAAkB,iBAAiB;AAEzC,QAAI;AACJ,QAAI;AACH,gBAAU,KAAK,MAAM;AAAA,aACb,GAAP;AACD,YAAM,QAAQ,oCAAoC,EAAE,qBAAqB;AACzE,cAAQ,SAAS;AACjB,YAAM,IAAI,MAAM;AAAA;AAEjB,QAAI,aAAa,QAAQ;AACzB,QAAI,eAAe,UAAU;AAC7B,QAAI,CAAC,cAAc;AAClB,YAAM,QAAQ,aAAa;AAC3B,cAAQ,MAAM;AACd,YAAM,IAAI,MAAM;AAAA;AAEjB,iBAAa,aAAa;AAE1B,WAAO,UAAU;AAEjB,QAAI,QAAQ,OAAO;AAClB,mBAAa,OAAO,QAAQ;AAAA,WACtB;AACN,mBAAa,QAAQ,QAAQ;AAAA;AAAA;;;AC1H/B,SAAO,KAAK;AAEL,uBAAqB,aAAa;AACxC,QAAI;AACH,oBAAc,KAAK,MAAM;AAAA,aACjB,GAAP;AACD,cAAQ,MAAM;AAAA;AAIf,WAAO,KAAK,OAAO,MAAM;AAGzB,WAAO,KAAK,aAAa,QAAQ,CAAC,gBAAgB;AAGjD,aAAO,GAAG,eAAe,OAAO,GAAG,gBAAgB;AAGnD,aAAO,KAAK,YAAY,cAAc,QAAQ,CAAC,eAAe;AAG7D,eAAO,GAAG,aAAa,cAAc,OAAO,GAAG,aAAa,eAAe;AAE3E,eAAO,KAAK,YAAY,aAAa,aAAa,QAAQ,CAAC,eAAe;AAEzE,iBAAO,GAAG,aAAa,YAAY,cAAc,WAAY;AAG5D,gBAAI,UAAU;AAGd,+BAAmB;AAClB,oBAAM,OAAO,GAAG,MAAM,KAAK;AAC3B,qBAAO,KAAK,CAAC,aAAa,YAAY,YAAY,KAAK,MAAM,MAAM;AAAA;AAIpE,oBAAQ,aAAa,SAAU,YAAY;AAC1C,wBAAU;AAAA;AAIX,oBAAQ,aAAa,WAAY;AAChC,qBAAO;AAAA;AAGR,mBAAO;AAAA;AAAA;AAAA;AAAA;AAAA;;;AC7DZ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAeO,0BAAwB;AAC3B,WAAO,SAAS;AAAA;AAGb,6BAA2B;AAC9B,WAAO,YAAY;AAAA;AAGhB,yCAAuC;AAC1C,WAAO,YAAY;AAAA;AAGhB,iCAA+B;AAClC,WAAO,YAAY;AAAA;AAGhB,gCAA8B;AACjC,WAAO,YAAY;AAAA;AAQhB,0BAAwB;AAC3B,WAAO,YAAY;AAAA;AAShB,0BAAwB,OAAO;AAClC,WAAO,YAAY,OAAO;AAAA;AAQvB,8BAA4B;AAC/B,WAAO,YAAY;AAAA;AAQhB,gCAA8B;AACjC,WAAO,YAAY;AAAA;AAUhB,yBAAuB,OAAO,QAAQ;AACzC,WAAO,YAAY,QAAQ,QAAQ,MAAM;AAAA;AAUtC,2BAAyB;AAC5B,WAAO,KAAK;AAAA;AAUT,4BAA0B,OAAO,QAAQ;AAC5C,WAAO,YAAY,QAAQ,QAAQ,MAAM;AAAA;AAUtC,4BAA0B,OAAO,QAAQ;AAC5C,WAAO,YAAY,QAAQ,QAAQ,MAAM;AAAA;AAUtC,6BAA2B,GAAG,GAAG;AACpC,WAAO,YAAY,QAAQ,IAAI,MAAM;AAAA;AASlC,+BAA6B;AAChC,WAAO,KAAK;AAAA;AAQT,wBAAsB;AACzB,WAAO,YAAY;AAAA;AAQhB,wBAAsB;AACzB,WAAO,YAAY;AAAA;AAQhB,4BAA0B;AAC7B,WAAO,YAAY;AAAA;AAQhB,kCAAgC;AACnC,WAAO,YAAY;AAAA;AAQhB,8BAA4B;AAC/B,WAAO,YAAY;AAAA;AAQhB,4BAA0B;AAC7B,WAAO,YAAY;AAAA;AAQhB,8BAA4B;AAC/B,WAAO,YAAY;AAAA;AAahB,yBAAuB,GAAG,GAAG,GAAG,GAAG;AACtC,QAAI,OAAO,KAAK,UAAU,EAAC,GAAG,KAAK,GAAG,GAAG,KAAK,GAAG,GAAG,KAAK,GAAG,GAAG,KAAK;AACpE,WAAO,YAAY,QAAQ;AAAA;;;ACpN/B;AAAA;AAAA;AAAA;AAKO,0BAAwB,KAAK;AAClC,WAAO,YAAY,QAAQ;AAAA;;;ACYtB,kBAAgB;AACnB,WAAO,YAAY;AAAA;AAGhB,yBAAuB;AAC1B,WAAO,KAAK;AAAA;AAIhB,SAAO,UAAU;AAAA,OACV;AAAA,OACA;AAAA,OACA;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAIJ,SAAO,QAAQ;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO;AAAA,MACH,sBAAsB;AAAA,MACtB,gCAAgC;AAAA,MAChC,cAAc;AAAA,MACd,eAAe;AAAA,MACf,iBAAiB;AAAA,MACjB,iBAAiB;AAAA;AAAA;AAKzB,SAAO,MAAM,YAAY,OAAO;AAChC,SAAO,OAAO,MAAM;AAKpB,MAAI,MAAW;AACX,WAAO,OAAO;AAAA;AAGlB,MAAI;AACJ,MAAI,eAAe;AAEnB,kBAAgB;AACZ,WAAO,YAAY;AAAA;AAKvB,SAAO,iBAAiB,aAAa,CAAC,MAAM;AAGxC,QAAI,OAAO,MAAM,MAAM,YAAY;AAC/B,aAAO,YAAY,YAAY,OAAO,MAAM,MAAM;AAClD,QAAE;AACF;AAAA;AAIJ,QAAI,iBAAiB,EAAE;AACvB,WAAO,kBAAkB,MAAM;AAC3B,UAAI,eAAe,aAAa,uBAAuB;AACnD;AAAA,iBACO,eAAe,aAAa,oBAAoB;AACvD,YAAI,OAAO,MAAM,MAAM,sBAAsB;AAEzC,cAAI,EAAE,UAAU,EAAE,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,cAAc;AACvE;AAAA;AAAA;AAGR,YAAI,IAAI,OAAO,YAAY,eAAe,OAAO,MAAM,MAAM,iBAAiB;AAC1E,uBAAa;AACb;AAAA;AAEJ,sBAAc,WAAW,MAAM,OAAO,MAAM,MAAM;AAClD,uBAAe,IAAI,OAAO;AAC1B,UAAE;AACF;AAAA;AAEJ,uBAAiB,eAAe;AAAA;AAAA;AAIxC,qBAAmB,QAAQ;AACvB,aAAS,KAAK,MAAM,SAAS,UAAU,OAAO,MAAM,MAAM;AAC1D,WAAO,MAAM,MAAM,aAAa;AAAA;AAGpC,SAAO,iBAAiB,aAAa,SAAU,GAAG;AAC9C,QAAI,CAAC,OAAO,MAAM,MAAM,cAAc;AAClC;AAAA;AAEJ,QAAI,OAAO,MAAM,MAAM,iBAAiB,MAAM;AAC1C,aAAO,MAAM,MAAM,gBAAgB,SAAS,KAAK,MAAM;AAAA;AAE3D,QAAI,OAAO,aAAa,EAAE,UAAU,OAAO,MAAM,MAAM,mBAAmB,OAAO,cAAc,EAAE,UAAU,OAAO,MAAM,MAAM,iBAAiB;AAC3I,eAAS,KAAK,MAAM,SAAS;AAAA;AAEjC,QAAI,cAAc,OAAO,aAAa,EAAE,UAAU,OAAO,MAAM,MAAM;AACrE,QAAI,aAAa,EAAE,UAAU,OAAO,MAAM,MAAM;AAChD,QAAI,YAAY,EAAE,UAAU,OAAO,MAAM,MAAM;AAC/C,QAAI,eAAe,OAAO,cAAc,EAAE,UAAU,OAAO,MAAM,MAAM;AAGvE,QAAI,CAAC,cAAc,CAAC,eAAe,CAAC,aAAa,CAAC,gBAAgB,OAAO,MAAM,MAAM,eAAe,QAAW;AAC3G;AAAA,eACO,eAAe;AAAc,gBAAU;AAAA,aACzC,cAAc;AAAc,gBAAU;AAAA,aACtC,cAAc;AAAW,gBAAU;AAAA,aACnC,aAAa;AAAa,gBAAU;AAAA,aACpC;AAAY,gBAAU;AAAA,aACtB;AAAW,gBAAU;AAAA,aACrB;AAAc,gBAAU;AAAA,aACxB;AAAa,gBAAU;AAAA;AAKpC,SAAO,iBAAiB,eAAe,SAAU,GAAG;AAChD,QAAI,OAAO,MAAM,MAAM,gCAAgC;AACnD,QAAE;AAAA;AAAA;",
  "names": []
}
 +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["desktop/log.js", "desktop/events.js", "desktop/calls.js", "desktop/bindings.js", "desktop/window.js", "desktop/browser.js", "desktop/main.js"],
  "sourcesContent": ["/*\r\n _       __      _ __\r\n| |     / /___ _(_) /____\r\n| | /| / / __ `/ / / ___/\r\n| |/ |/ / /_/ / / (__  )\r\n|__/|__/\\__,_/_/_/____/\r\nThe electron alternative for Go\r\n(c) Lea Anthony 2019-present\r\n*/\r\n\r\n/* jshint esversion: 6 */\r\n\r\n/**\r\n * Sends a log message to the backend with the given level + message\r\n *\r\n * @param {string} level\r\n * @param {string} message\r\n */\r\nfunction sendLogMessage(level, message) {\r\n\r\n\t// Log Message format:\r\n\t// l[type][message]\r\n\twindow.WailsInvoke('L' + level + message);\r\n}\r\n\r\n/**\r\n * Log the given trace message with the backend\r\n *\r\n * @export\r\n * @param {string} message\r\n */\r\nexport function LogTrace(message) {\r\n\tsendLogMessage('T', message);\r\n}\r\n\r\n/**\r\n * Log the given message with the backend\r\n *\r\n * @export\r\n * @param {string} message\r\n */\r\nexport function LogPrint(message) {\r\n\tsendLogMessage('P', message);\r\n}\r\n\r\n/**\r\n * Log the given debug message with the backend\r\n *\r\n * @export\r\n * @param {string} message\r\n */\r\nexport function LogDebug(message) {\r\n\tsendLogMessage('D', message);\r\n}\r\n\r\n/**\r\n * Log the given info message with the backend\r\n *\r\n * @export\r\n * @param {string} message\r\n */\r\nexport function LogInfo(message) {\r\n\tsendLogMessage('I', message);\r\n}\r\n\r\n/**\r\n * Log the given warning message with the backend\r\n *\r\n * @export\r\n * @param {string} message\r\n */\r\nexport function LogWarning(message) {\r\n\tsendLogMessage('W', message);\r\n}\r\n\r\n/**\r\n * Log the given error message with the backend\r\n *\r\n * @export\r\n * @param {string} message\r\n */\r\nexport function LogError(message) {\r\n\tsendLogMessage('E', message);\r\n}\r\n\r\n/**\r\n * Log the given fatal message with the backend\r\n *\r\n * @export\r\n * @param {string} message\r\n */\r\nexport function LogFatal(message) {\r\n\tsendLogMessage('F', message);\r\n}\r\n\r\n/**\r\n * Sets the Log level to the given log level\r\n *\r\n * @export\r\n * @param {number} loglevel\r\n */\r\nexport function SetLogLevel(loglevel) {\r\n\tsendLogMessage('S', loglevel);\r\n}\r\n\r\n// Log levels\r\nexport const LogLevel = {\r\n\tTRACE: 1,\r\n\tDEBUG: 2,\r\n\tINFO: 3,\r\n\tWARNING: 4,\r\n\tERROR: 5,\r\n};\r\n", "/*\r\n _       __      _ __\r\n| |     / /___ _(_) /____\r\n| | /| / / __ `/ / / ___/\r\n| |/ |/ / /_/ / / (__  )\r\n|__/|__/\\__,_/_/_/____/\r\nThe electron alternative for Go\r\n(c) Lea Anthony 2019-present\r\n*/\r\n/* jshint esversion: 6 */\r\n\r\n// Defines a single listener with a maximum number of times to callback\r\n\r\n/**\r\n * The Listener class defines a listener! :-)\r\n *\r\n * @class Listener\r\n */\r\nclass Listener {\r\n    /**\r\n     * Creates an instance of Listener.\r\n     * @param {function} callback\r\n     * @param {number} maxCallbacks\r\n     * @memberof Listener\r\n     */\r\n    constructor(callback, maxCallbacks) {\r\n        // Default of -1 means infinite\r\n        maxCallbacks = maxCallbacks || -1;\r\n        // Callback invokes the callback with the given data\r\n        // Returns true if this listener should be destroyed\r\n        this.Callback = (data) => {\r\n            callback.apply(null, data);\r\n            // If maxCallbacks is infinite, return false (do not destroy)\r\n            if (maxCallbacks === -1) {\r\n                return false;\r\n            }\r\n            // Decrement maxCallbacks. Return true if now 0, otherwise false\r\n            maxCallbacks -= 1;\r\n            return maxCallbacks === 0;\r\n        };\r\n    }\r\n}\r\n\r\nexport const eventListeners = {};\r\n\r\n/**\r\n * Registers an event listener that will be invoked `maxCallbacks` times before being destroyed\r\n *\r\n * @export\r\n * @param {string} eventName\r\n * @param {function} callback\r\n * @param {number} maxCallbacks\r\n */\r\nexport function EventsOnMultiple(eventName, callback, maxCallbacks) {\r\n    eventListeners[eventName] = eventListeners[eventName] || [];\r\n    const thisListener = new Listener(callback, maxCallbacks);\r\n    eventListeners[eventName].push(thisListener);\r\n}\r\n\r\n/**\r\n * Registers an event listener that will be invoked every time the event is emitted\r\n *\r\n * @export\r\n * @param {string} eventName\r\n * @param {function} callback\r\n */\r\nexport function EventsOn(eventName, callback) {\r\n    EventsOnMultiple(eventName, callback, -1);\r\n}\r\n\r\n/**\r\n * Registers an event listener that will be invoked once then destroyed\r\n *\r\n * @export\r\n * @param {string} eventName\r\n * @param {function} callback\r\n */\r\nexport function EventsOnce(eventName, callback) {\r\n    EventsOnMultiple(eventName, callback, 1);\r\n}\r\n\r\nfunction notifyListeners(eventData) {\r\n\r\n    // Get the event name\r\n    let eventName = eventData.name;\r\n\r\n    // Check if we have any listeners for this event\r\n    if (eventListeners[eventName]) {\r\n\r\n        // Keep a list of listener indexes to destroy\r\n        const newEventListenerList = eventListeners[eventName].slice();\r\n\r\n        // Iterate listeners\r\n        for (let count = 0; count < eventListeners[eventName].length; count += 1) {\r\n\r\n            // Get next listener\r\n            const listener = eventListeners[eventName][count];\r\n\r\n            let data = eventData.data;\r\n\r\n            // Do the callback\r\n            const destroy = listener.Callback(data);\r\n            if (destroy) {\r\n                // if the listener indicated to destroy itself, add it to the destroy list\r\n                newEventListenerList.splice(count, 1);\r\n            }\r\n        }\r\n\r\n        // Update callbacks with new list of listeners\r\n        eventListeners[eventName] = newEventListenerList;\r\n    }\r\n}\r\n\r\n/**\r\n * Notify informs frontend listeners that an event was emitted with the given data\r\n *\r\n * @export\r\n * @param {string} notifyMessage - encoded notification message\r\n\r\n */\r\nexport function EventsNotify(notifyMessage) {\r\n    // Parse the message\r\n    let message;\r\n    try {\r\n        message = JSON.parse(notifyMessage);\r\n    } catch (e) {\r\n        const error = 'Invalid JSON passed to Notify: ' + notifyMessage;\r\n        throw new Error(error);\r\n    }\r\n    notifyListeners(message);\r\n}\r\n\r\n/**\r\n * Emit an event with the given name and data\r\n *\r\n * @export\r\n * @param {string} eventName\r\n */\r\nexport function EventsEmit(eventName) {\r\n\r\n    const payload = {\r\n        name: eventName,\r\n        data: [].slice.apply(arguments).slice(1),\r\n    };\r\n\r\n    // Notify JS listeners\r\n    notifyListeners(payload);\r\n\r\n    // Notify Go listeners\r\n    window.WailsInvoke('EE' + JSON.stringify(payload));\r\n}\r\n\r\nexport function EventsOff(eventName) {\r\n    // Remove local listeners\r\n    delete eventListeners[eventName];\r\n\r\n    // Notify Go listeners\r\n    window.WailsInvoke('EX' + eventName);\r\n}", "/*\r\n _       __      _ __\r\n| |     / /___ _(_) /____\r\n| | /| / / __ `/ / / ___/\r\n| |/ |/ / /_/ / / (__  )\r\n|__/|__/\\__,_/_/_/____/\r\nThe electron alternative for Go\r\n(c) Lea Anthony 2019-present\r\n*/\r\n/* jshint esversion: 6 */\r\n\r\nexport const callbacks = {};\r\n\r\n/**\r\n * Returns a number from the native browser random function\r\n *\r\n * @returns number\r\n */\r\nfunction cryptoRandom() {\r\n\tvar array = new Uint32Array(1);\r\n\treturn window.crypto.getRandomValues(array)[0];\r\n}\r\n\r\n/**\r\n * Returns a number using da old-skool Math.Random\r\n * I likes to call it LOLRandom\r\n *\r\n * @returns number\r\n */\r\nfunction basicRandom() {\r\n\treturn Math.random() * 9007199254740991;\r\n}\r\n\r\n// Pick a random number function based on browser capability\r\nvar randomFunc;\r\nif (window.crypto) {\r\n\trandomFunc = cryptoRandom;\r\n} else {\r\n\trandomFunc = basicRandom;\r\n}\r\n\r\n\r\n/**\r\n * Call sends a message to the backend to call the binding with the\r\n * given data. A promise is returned and will be completed when the\r\n * backend responds. This will be resolved when the call was successful\r\n * or rejected if an error is passed back.\r\n * There is a timeout mechanism. If the call doesn't respond in the given\r\n * time (in milliseconds) then the promise is rejected.\r\n *\r\n * @export\r\n * @param {string} name\r\n * @param {any=} args\r\n * @param {number=} timeout\r\n * @returns\r\n */\r\nexport function Call(name, args, timeout) {\r\n\r\n\t// Timeout infinite by default\r\n\tif (timeout == null) {\r\n\t\ttimeout = 0;\r\n\t}\r\n\r\n\t// Create a promise\r\n\treturn new Promise(function (resolve, reject) {\r\n\r\n\t\t// Create a unique callbackID\r\n\t\tvar callbackID;\r\n\t\tdo {\r\n\t\t\tcallbackID = name + '-' + randomFunc();\r\n\t\t} while (callbacks[callbackID]);\r\n\r\n\t\tvar timeoutHandle;\r\n\t\t// Set timeout\r\n\t\tif (timeout > 0) {\r\n\t\t\ttimeoutHandle = setTimeout(function () {\r\n\t\t\t\treject(Error('Call to ' + name + ' timed out. Request ID: ' + callbackID));\r\n\t\t\t}, timeout);\r\n\t\t}\r\n\r\n\t\t// Store callback\r\n\t\tcallbacks[callbackID] = {\r\n\t\t\ttimeoutHandle: timeoutHandle,\r\n\t\t\treject: reject,\r\n\t\t\tresolve: resolve\r\n\t\t};\r\n\r\n\t\ttry {\r\n\t\t\tconst payload = {\r\n\t\t\t\tname,\r\n\t\t\t\targs,\r\n\t\t\t\tcallbackID,\r\n\t\t\t};\r\n\r\n\t\t\t// Make the call\r\n\t\t\twindow.WailsInvoke('C' + JSON.stringify(payload));\r\n\t\t} catch (e) {\r\n\t\t\t// eslint-disable-next-line\r\n\t\t\tconsole.error(e);\r\n\t\t}\r\n\t});\r\n}\r\n\r\n\r\n\r\n/**\r\n * Called by the backend to return data to a previously called\r\n * binding invocation\r\n *\r\n * @export\r\n * @param {string} incomingMessage\r\n */\r\nexport function Callback(incomingMessage) {\r\n\t// Parse the message\r\n\tlet message;\r\n\ttry {\r\n\t\tmessage = JSON.parse(incomingMessage);\r\n\t} catch (e) {\r\n\t\tconst error = `Invalid JSON passed to callback: ${e.message}. Message: ${incomingMessage}`;\r\n\t\truntime.LogDebug(error);\r\n\t\tthrow new Error(error);\r\n\t}\r\n\tlet callbackID = message.callbackid;\r\n\tlet callbackData = callbacks[callbackID];\r\n\tif (!callbackData) {\r\n\t\tconst error = `Callback '${callbackID}' not registered!!!`;\r\n\t\tconsole.error(error); // eslint-disable-line\r\n\t\tthrow new Error(error);\r\n\t}\r\n\tclearTimeout(callbackData.timeoutHandle);\r\n\r\n\tdelete callbacks[callbackID];\r\n\r\n\tif (message.error) {\r\n\t\tcallbackData.reject(message.error);\r\n\t} else {\r\n\t\tcallbackData.resolve(message.result);\r\n\t}\r\n}\r\n", "/*\r\n _       __      _ __    \r\n| |     / /___ _(_) /____\r\n| | /| / / __ `/ / / ___/\r\n| |/ |/ / /_/ / / (__  ) \r\n|__/|__/\\__,_/_/_/____/  \r\nThe electron alternative for Go\r\n(c) Lea Anthony 2019-present\r\n*/\r\n/* jshint esversion: 6 */\r\n\r\nimport {Call} from './calls';\r\n\r\n// This is where we bind go method wrappers\r\nwindow.go = {};\r\n\r\nexport function SetBindings(bindingsMap) {\r\n\ttry {\r\n\t\tbindingsMap = JSON.parse(bindingsMap);\r\n\t} catch (e) {\r\n\t\tconsole.error(e);\r\n\t}\r\n\r\n\t// Initialise the bindings map\r\n\twindow.go = window.go || {};\r\n\r\n\t// Iterate package names\r\n\tObject.keys(bindingsMap).forEach((packageName) => {\r\n\r\n\t\t// Create inner map if it doesn't exist\r\n\t\twindow.go[packageName] = window.go[packageName] || {};\r\n\r\n\t\t// Iterate struct names\r\n\t\tObject.keys(bindingsMap[packageName]).forEach((structName) => {\r\n\r\n\t\t\t// Create inner map if it doesn't exist\r\n\t\t\twindow.go[packageName][structName] = window.go[packageName][structName] || {};\r\n\r\n\t\t\tObject.keys(bindingsMap[packageName][structName]).forEach((methodName) => {\r\n\r\n\t\t\t\twindow.go[packageName][structName][methodName] = function () {\r\n\r\n\t\t\t\t\t// No timeout by default\r\n\t\t\t\t\tlet timeout = 0;\r\n\r\n\t\t\t\t\t// Actual function\r\n\t\t\t\t\tfunction dynamic() {\r\n\t\t\t\t\t\tconst args = [].slice.call(arguments);\r\n\t\t\t\t\t\treturn Call([packageName, structName, methodName].join('.'), args, timeout);\r\n\t\t\t\t\t}\r\n\r\n\t\t\t\t\t// Allow setting timeout to function\r\n\t\t\t\t\tdynamic.setTimeout = function (newTimeout) {\r\n\t\t\t\t\t\ttimeout = newTimeout;\r\n\t\t\t\t\t};\r\n\r\n\t\t\t\t\t// Allow getting timeout to function\r\n\t\t\t\t\tdynamic.getTimeout = function () {\r\n\t\t\t\t\t\treturn timeout;\r\n\t\t\t\t\t};\r\n\r\n\t\t\t\t\treturn dynamic;\r\n\t\t\t\t}();\r\n\t\t\t});\r\n\t\t});\r\n\t});\r\n}\r\n", "/*\r\n _\t   __\t  _ __\r\n| |\t / /___ _(_) /____\r\n| | /| / / __ `/ / / ___/\r\n| |/ |/ / /_/ / / (__  )\r\n|__/|__/\\__,_/_/_/____/\r\nThe electron alternative for Go\r\n(c) Lea Anthony 2019-present\r\n*/\r\n\r\n/* jshint esversion: 9 */\r\n\r\n\r\nimport { Call } from \"./calls\";\r\n\r\nexport function WindowReload() {\r\n    window.location.reload();\r\n}\r\n\r\nexport function WindowReloadApp() {\r\n    window.WailsInvoke('WR');\r\n}\r\n\r\nexport function WindowSetSystemDefaultTheme() {\r\n    window.WailsInvoke('WASDT');\r\n}\r\n\r\nexport function WindowSetLightTheme() {\r\n    window.WailsInvoke('WALT');\r\n}\r\n\r\nexport function WindowSetDarkTheme() {\r\n    window.WailsInvoke('WADT');\r\n}\r\n\r\n/**\r\n * Place the window in the center of the screen\r\n *\r\n * @export\r\n */\r\nexport function WindowCenter() {\r\n    window.WailsInvoke('Wc');\r\n}\r\n\r\n/**\r\n * Sets the window title\r\n *\r\n * @param {string} title\r\n * @export\r\n */\r\nexport function WindowSetTitle(title) {\r\n    window.WailsInvoke('WT' + title);\r\n}\r\n\r\n/**\r\n * Makes the window go fullscreen\r\n *\r\n * @export\r\n */\r\nexport function WindowFullscreen() {\r\n    window.WailsInvoke('WF');\r\n}\r\n\r\n/**\r\n * Reverts the window from fullscreen\r\n *\r\n * @export\r\n */\r\nexport function WindowUnfullscreen() {\r\n    window.WailsInvoke('Wf');\r\n}\r\n\r\n/**\r\n * Set the Size of the window\r\n *\r\n * @export\r\n * @param {number} width\r\n * @param {number} height\r\n */\r\nexport function WindowSetSize(width, height) {\r\n    window.WailsInvoke('Ws:' + width + ':' + height);\r\n}\r\n\r\n/**\r\n * Get the Size of the window\r\n *\r\n * @export\r\n * @return {Promise<{w: number, h: number}>} The size of the window\r\n\r\n */\r\nexport function WindowGetSize() {\r\n    return Call(\":wails:WindowGetSize\");\r\n}\r\n\r\n/**\r\n * Set the maximum size of the window\r\n *\r\n * @export\r\n * @param {number} width\r\n * @param {number} height\r\n */\r\nexport function WindowSetMaxSize(width, height) {\r\n    window.WailsInvoke('WZ:' + width + ':' + height);\r\n}\r\n\r\n/**\r\n * Set the minimum size of the window\r\n *\r\n * @export\r\n * @param {number} width\r\n * @param {number} height\r\n */\r\nexport function WindowSetMinSize(width, height) {\r\n    window.WailsInvoke('Wz:' + width + ':' + height);\r\n}\r\n\r\n\r\n\r\n/**\r\n * Set the window AlwaysOnTop or not on top\r\n *\r\n * @export\r\n */\r\nexport function WindowSetAlwaysOnTop(b) {\r\n\r\n    window.WailsInvoke('WATP:' + (b ? '1' : '0'));\r\n}\r\n\r\n\r\n\r\n\r\n/**\r\n * Set the Position of the window\r\n *\r\n * @export\r\n * @param {number} x\r\n * @param {number} y\r\n */\r\nexport function WindowSetPosition(x, y) {\r\n    window.WailsInvoke('Wp:' + x + ':' + y);\r\n}\r\n\r\n/**\r\n * Get the Position of the window\r\n *\r\n * @export\r\n * @return {Promise<{x: number, y: number}>} The position of the window\r\n */\r\nexport function WindowGetPosition() {\r\n    return Call(\":wails:WindowGetPos\");\r\n}\r\n\r\n/**\r\n * Hide the Window\r\n *\r\n * @export\r\n */\r\nexport function WindowHide() {\r\n    window.WailsInvoke('WH');\r\n}\r\n\r\n/**\r\n * Show the Window\r\n *\r\n * @export\r\n */\r\nexport function WindowShow() {\r\n    window.WailsInvoke('WS');\r\n}\r\n\r\n/**\r\n * Maximise the Window\r\n *\r\n * @export\r\n */\r\nexport function WindowMaximise() {\r\n    window.WailsInvoke('WM');\r\n}\r\n\r\n/**\r\n * Toggle the Maximise of the Window\r\n *\r\n * @export\r\n */\r\nexport function WindowToggleMaximise() {\r\n    window.WailsInvoke('Wt');\r\n}\r\n\r\n/**\r\n * Unmaximise the Window\r\n *\r\n * @export\r\n */\r\nexport function WindowUnmaximise() {\r\n    window.WailsInvoke('WU');\r\n}\r\n\r\n/**\r\n * Minimise the Window\r\n *\r\n * @export\r\n */\r\nexport function WindowMinimise() {\r\n    window.WailsInvoke('Wm');\r\n}\r\n\r\n/**\r\n * Unminimise the Window\r\n *\r\n * @export\r\n */\r\nexport function WindowUnminimise() {\r\n    window.WailsInvoke('Wu');\r\n}\r\n\r\n/**\r\n * Sets the background colour of the window\r\n *\r\n * @export\r\n * @param {number} R Red\r\n * @param {number} G Green\r\n * @param {number} B Blue\r\n * @param {number} A Alpha\r\n */\r\nexport function WindowSetBackgroundColour(R, G, B, A) {\r\n    let rgba = JSON.stringify({ r: R || 0, g: G || 0, b: B || 0, a: A || 255 });\r\n    window.WailsInvoke('Wr:' + rgba);\r\n}\r\n\r\n", "/**\r\n * @description: Use the system default browser to open the url\r\n * @param {string} url \r\n * @return {void}\r\n */\r\nexport function BrowserOpenURL(url) {\r\n  window.WailsInvoke('BO:' + url);\r\n}", "/*\r\n _\t   __\t  _ __\r\n| |\t / /___ _(_) /____\r\n| | /| / / __ `/ / / ___/\r\n| |/ |/ / /_/ / / (__  )\r\n|__/|__/\\__,_/_/_/____/\r\nThe electron alternative for Go\r\n(c) Lea Anthony 2019-present\r\n*/\r\n/* jshint esversion: 9 */\r\nimport * as Log from './log';\r\nimport {eventListeners, EventsEmit, EventsNotify, EventsOff, EventsOn, EventsOnce, EventsOnMultiple} from './events';\r\nimport {Call, Callback, callbacks} from './calls';\r\nimport {SetBindings} from \"./bindings\";\r\nimport * as Window from \"./window\";\r\nimport * as Browser from \"./browser\";\r\n\r\n\r\nexport function Quit() {\r\n    window.WailsInvoke('Q');\r\n}\r\n\r\nexport function Environment() {\r\n    return Call(\":wails:Environment\");\r\n}\r\n\r\n// The JS runtime\r\nwindow.runtime = {\r\n    ...Log,\r\n    ...Window,\r\n    ...Browser,\r\n    EventsOn,\r\n    EventsOnce,\r\n    EventsOnMultiple,\r\n    EventsEmit,\r\n    EventsOff,\r\n    Environment,\r\n    Quit\r\n};\r\n\r\n// Internal wails endpoints\r\nwindow.wails = {\r\n    Callback,\r\n    EventsNotify,\r\n    SetBindings,\r\n    eventListeners,\r\n    callbacks,\r\n    flags: {\r\n        disableScrollbarDrag: false,\r\n        disableWailsDefaultContextMenu: false,\r\n        enableResize: false,\r\n        defaultCursor: null,\r\n        borderThickness: 6,\r\n        dbClickInterval: 100,\r\n    }\r\n};\r\n\r\n// Set the bindings\r\nwindow.wails.SetBindings(window.wailsbindings);\r\ndelete window.wails.SetBindings;\r\n\r\n// This is evaluated at build time in package.json\r\n// const dev = 0;\r\n// const production = 1;\r\nif (ENV === 0) {\r\n    delete window.wailsbindings;\r\n}\r\n\r\nvar dragTimeOut;\r\nvar dragLastTime = 0;\r\n\r\nfunction drag() {\r\n    window.WailsInvoke(\"drag\");\r\n}\r\n\r\n// Setup drag handler\r\n// Based on code from: https://github.com/patr0nus/DeskGap\r\nwindow.addEventListener('mousedown', (e) => {\r\n\r\n    // Check for resizing\r\n    if (window.wails.flags.resizeEdge) {\r\n        window.WailsInvoke(\"resize:\" + window.wails.flags.resizeEdge);\r\n        e.preventDefault();\r\n        return;\r\n    }\r\n\r\n    // Check for dragging\r\n    let currentElement = e.target;\r\n    while (currentElement != null) {\r\n        if (currentElement.hasAttribute('data-wails-no-drag')) {\r\n            break;\r\n        } else if (currentElement.hasAttribute('data-wails-drag')) {\r\n            if (window.wails.flags.disableScrollbarDrag) {\r\n                // This checks for clicks on the scroll bar\r\n                if (e.offsetX > e.target.clientWidth || e.offsetY > e.target.clientHeight) {\r\n                    break;\r\n                }\r\n            }\r\n            if (new Date().getTime() - dragLastTime < window.wails.flags.dbClickInterval) {\r\n                clearTimeout(dragTimeOut);\r\n                break;\r\n            }\r\n            dragTimeOut = setTimeout(drag, window.wails.flags.dbClickInterval);\r\n            dragLastTime = new Date().getTime();\r\n            e.preventDefault();\r\n            break;\r\n        }\r\n        currentElement = currentElement.parentElement;\r\n    }\r\n});\r\n\r\nfunction setResize(cursor) {\r\n    document.body.style.cursor = cursor || window.wails.flags.defaultCursor;\r\n    window.wails.flags.resizeEdge = cursor;\r\n}\r\n\r\nwindow.addEventListener('mousemove', function (e) {\r\n    if (!window.wails.flags.enableResize) {\r\n        return;\r\n    }\r\n    if (window.wails.flags.defaultCursor == null) {\r\n        window.wails.flags.defaultCursor = document.body.style.cursor;\r\n    }\r\n    if (window.outerWidth - e.clientX < window.wails.flags.borderThickness && window.outerHeight - e.clientY < window.wails.flags.borderThickness) {\r\n        document.body.style.cursor = \"se-resize\";\r\n    }\r\n    let rightBorder = window.outerWidth - e.clientX < window.wails.flags.borderThickness;\r\n    let leftBorder = e.clientX < window.wails.flags.borderThickness;\r\n    let topBorder = e.clientY < window.wails.flags.borderThickness;\r\n    let bottomBorder = window.outerHeight - e.clientY < window.wails.flags.borderThickness;\r\n\r\n    // If we aren't on an edge, but were, reset the cursor to default\r\n    if (!leftBorder && !rightBorder && !topBorder && !bottomBorder && window.wails.flags.resizeEdge !== undefined) {\r\n        setResize();\r\n    } else if (rightBorder && bottomBorder) setResize(\"se-resize\");\r\n    else if (leftBorder && bottomBorder) setResize(\"sw-resize\");\r\n    else if (leftBorder && topBorder) setResize(\"nw-resize\");\r\n    else if (topBorder && rightBorder) setResize(\"ne-resize\");\r\n    else if (leftBorder) setResize(\"w-resize\");\r\n    else if (topBorder) setResize(\"n-resize\");\r\n    else if (bottomBorder) setResize(\"s-resize\");\r\n    else if (rightBorder) setResize(\"e-resize\");\r\n\r\n});\r\n\r\n// Setup context menu hook\r\nwindow.addEventListener('contextmenu', function (e) {\r\n    if (window.wails.flags.disableWailsDefaultContextMenu) {\r\n        e.preventDefault();\r\n    }\r\n});"],
  "mappings": ";;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAkBA,0BAAwB,OAAO,SAAS;AAIvC,WAAO,YAAY,MAAM,QAAQ;AAAA;AAS3B,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,mBAAiB,SAAS;AAChC,mBAAe,KAAK;AAAA;AASd,sBAAoB,SAAS;AACnC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,oBAAkB,SAAS;AACjC,mBAAe,KAAK;AAAA;AASd,uBAAqB,UAAU;AACrC,mBAAe,KAAK;AAAA;AAId,MAAM,WAAW;AAAA,IACvB,OAAO;AAAA,IACP,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA;;;AC7FR,uBAAe;AAAA,IAOX,YAAY,UAAU,cAAc;AAEhC,qBAAe,gBAAgB;AAG/B,WAAK,WAAW,CAAC,SAAS;AACtB,iBAAS,MAAM,MAAM;AAErB,YAAI,iBAAiB,IAAI;AACrB,iBAAO;AAAA;AAGX,wBAAgB;AAChB,eAAO,iBAAiB;AAAA;AAAA;AAAA;AAK7B,MAAM,iBAAiB;AAUvB,4BAA0B,WAAW,UAAU,cAAc;AAChE,mBAAe,aAAa,eAAe,cAAc;AACzD,UAAM,eAAe,IAAI,SAAS,UAAU;AAC5C,mBAAe,WAAW,KAAK;AAAA;AAU5B,oBAAkB,WAAW,UAAU;AAC1C,qBAAiB,WAAW,UAAU;AAAA;AAUnC,sBAAoB,WAAW,UAAU;AAC5C,qBAAiB,WAAW,UAAU;AAAA;AAG1C,2BAAyB,WAAW;AAGhC,QAAI,YAAY,UAAU;AAG1B,QAAI,eAAe,YAAY;AAG3B,YAAM,uBAAuB,eAAe,WAAW;AAGvD,eAAS,QAAQ,GAAG,QAAQ,eAAe,WAAW,QAAQ,SAAS,GAAG;AAGtE,cAAM,WAAW,eAAe,WAAW;AAE3C,YAAI,OAAO,UAAU;AAGrB,cAAM,UAAU,SAAS,SAAS;AAClC,YAAI,SAAS;AAET,+BAAqB,OAAO,OAAO;AAAA;AAAA;AAK3C,qBAAe,aAAa;AAAA;AAAA;AAW7B,wBAAsB,eAAe;AAExC,QAAI;AACJ,QAAI;AACA,gBAAU,KAAK,MAAM;AAAA,aAChB,GAAP;AACE,YAAM,QAAQ,oCAAoC;AAClD,YAAM,IAAI,MAAM;AAAA;AAEpB,oBAAgB;AAAA;AASb,sBAAoB,WAAW;AAElC,UAAM,UAAU;AAAA,MACZ,MAAM;AAAA,MACN,MAAM,GAAG,MAAM,MAAM,WAAW,MAAM;AAAA;AAI1C,oBAAgB;AAGhB,WAAO,YAAY,OAAO,KAAK,UAAU;AAAA;AAGtC,qBAAmB,WAAW;AAEjC,WAAO,eAAe;AAGtB,WAAO,YAAY,OAAO;AAAA;;;AClJvB,MAAM,YAAY;AAOzB,0BAAwB;AACvB,QAAI,QAAQ,IAAI,YAAY;AAC5B,WAAO,OAAO,OAAO,gBAAgB,OAAO;AAAA;AAS7C,yBAAuB;AACtB,WAAO,KAAK,WAAW;AAAA;AAIxB,MAAI;AACJ,MAAI,OAAO,QAAQ;AAClB,iBAAa;AAAA,SACP;AACN,iBAAa;AAAA;AAkBP,gBAAc,MAAM,MAAM,SAAS;AAGzC,QAAI,WAAW,MAAM;AACpB,gBAAU;AAAA;AAIX,WAAO,IAAI,QAAQ,SAAU,SAAS,QAAQ;AAG7C,UAAI;AACJ,SAAG;AACF,qBAAa,OAAO,MAAM;AAAA,eAClB,UAAU;AAEnB,UAAI;AAEJ,UAAI,UAAU,GAAG;AAChB,wBAAgB,WAAW,WAAY;AACtC,iBAAO,MAAM,aAAa,OAAO,6BAA6B;AAAA,WAC5D;AAAA;AAIJ,gBAAU,cAAc;AAAA,QACvB;AAAA,QACA;AAAA,QACA;AAAA;AAGD,UAAI;AACH,cAAM,UAAU;AAAA,UACf;AAAA,UACA;AAAA,UACA;AAAA;AAID,eAAO,YAAY,MAAM,KAAK,UAAU;AAAA,eAChC,GAAP;AAED,gBAAQ,MAAM;AAAA;AAAA;AAAA;AAcV,oBAAkB,iBAAiB;AAEzC,QAAI;AACJ,QAAI;AACH,gBAAU,KAAK,MAAM;AAAA,aACb,GAAP;AACD,YAAM,QAAQ,oCAAoC,EAAE,qBAAqB;AACzE,cAAQ,SAAS;AACjB,YAAM,IAAI,MAAM;AAAA;AAEjB,QAAI,aAAa,QAAQ;AACzB,QAAI,eAAe,UAAU;AAC7B,QAAI,CAAC,cAAc;AAClB,YAAM,QAAQ,aAAa;AAC3B,cAAQ,MAAM;AACd,YAAM,IAAI,MAAM;AAAA;AAEjB,iBAAa,aAAa;AAE1B,WAAO,UAAU;AAEjB,QAAI,QAAQ,OAAO;AAClB,mBAAa,OAAO,QAAQ;AAAA,WACtB;AACN,mBAAa,QAAQ,QAAQ;AAAA;AAAA;;;AC1H/B,SAAO,KAAK;AAEL,uBAAqB,aAAa;AACxC,QAAI;AACH,oBAAc,KAAK,MAAM;AAAA,aACjB,GAAP;AACD,cAAQ,MAAM;AAAA;AAIf,WAAO,KAAK,OAAO,MAAM;AAGzB,WAAO,KAAK,aAAa,QAAQ,CAAC,gBAAgB;AAGjD,aAAO,GAAG,eAAe,OAAO,GAAG,gBAAgB;AAGnD,aAAO,KAAK,YAAY,cAAc,QAAQ,CAAC,eAAe;AAG7D,eAAO,GAAG,aAAa,cAAc,OAAO,GAAG,aAAa,eAAe;AAE3E,eAAO,KAAK,YAAY,aAAa,aAAa,QAAQ,CAAC,eAAe;AAEzE,iBAAO,GAAG,aAAa,YAAY,cAAc,WAAY;AAG5D,gBAAI,UAAU;AAGd,+BAAmB;AAClB,oBAAM,OAAO,GAAG,MAAM,KAAK;AAC3B,qBAAO,KAAK,CAAC,aAAa,YAAY,YAAY,KAAK,MAAM,MAAM;AAAA;AAIpE,oBAAQ,aAAa,SAAU,YAAY;AAC1C,wBAAU;AAAA;AAIX,oBAAQ,aAAa,WAAY;AAChC,qBAAO;AAAA;AAGR,mBAAO;AAAA;AAAA;AAAA;AAAA;AAAA;;;AC7DZ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAeO,0BAAwB;AAC3B,WAAO,SAAS;AAAA;AAGb,6BAA2B;AAC9B,WAAO,YAAY;AAAA;AAGhB,yCAAuC;AAC1C,WAAO,YAAY;AAAA;AAGhB,iCAA+B;AAClC,WAAO,YAAY;AAAA;AAGhB,gCAA8B;AACjC,WAAO,YAAY;AAAA;AAQhB,0BAAwB;AAC3B,WAAO,YAAY;AAAA;AAShB,0BAAwB,OAAO;AAClC,WAAO,YAAY,OAAO;AAAA;AAQvB,8BAA4B;AAC/B,WAAO,YAAY;AAAA;AAQhB,gCAA8B;AACjC,WAAO,YAAY;AAAA;AAUhB,yBAAuB,OAAO,QAAQ;AACzC,WAAO,YAAY,QAAQ,QAAQ,MAAM;AAAA;AAUtC,2BAAyB;AAC5B,WAAO,KAAK;AAAA;AAUT,4BAA0B,OAAO,QAAQ;AAC5C,WAAO,YAAY,QAAQ,QAAQ,MAAM;AAAA;AAUtC,4BAA0B,OAAO,QAAQ;AAC5C,WAAO,YAAY,QAAQ,QAAQ,MAAM;AAAA;AAUtC,gCAA8B,GAAG;AAEpC,WAAO,YAAY,UAAW,KAAI,MAAM;AAAA;AAarC,6BAA2B,GAAG,GAAG;AACpC,WAAO,YAAY,QAAQ,IAAI,MAAM;AAAA;AASlC,+BAA6B;AAChC,WAAO,KAAK;AAAA;AAQT,wBAAsB;AACzB,WAAO,YAAY;AAAA;AAQhB,wBAAsB;AACzB,WAAO,YAAY;AAAA;AAQhB,4BAA0B;AAC7B,WAAO,YAAY;AAAA;AAQhB,kCAAgC;AACnC,WAAO,YAAY;AAAA;AAQhB,8BAA4B;AAC/B,WAAO,YAAY;AAAA;AAQhB,4BAA0B;AAC7B,WAAO,YAAY;AAAA;AAQhB,8BAA4B;AAC/B,WAAO,YAAY;AAAA;AAYhB,qCAAmC,GAAG,GAAG,GAAG,GAAG;AAClD,QAAI,OAAO,KAAK,UAAU,EAAE,GAAG,KAAK,GAAG,GAAG,KAAK,GAAG,GAAG,KAAK,GAAG,GAAG,KAAK;AACrE,WAAO,YAAY,QAAQ;AAAA;;;AClO/B;AAAA;AAAA;AAAA;AAKO,0BAAwB,KAAK;AAClC,WAAO,YAAY,QAAQ;AAAA;;;ACYtB,kBAAgB;AACnB,WAAO,YAAY;AAAA;AAGhB,yBAAuB;AAC1B,WAAO,KAAK;AAAA;AAIhB,SAAO,UAAU;AAAA,OACV;AAAA,OACA;AAAA,OACA;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAIJ,SAAO,QAAQ;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO;AAAA,MACH,sBAAsB;AAAA,MACtB,gCAAgC;AAAA,MAChC,cAAc;AAAA,MACd,eAAe;AAAA,MACf,iBAAiB;AAAA,MACjB,iBAAiB;AAAA;AAAA;AAKzB,SAAO,MAAM,YAAY,OAAO;AAChC,SAAO,OAAO,MAAM;AAKpB,MAAI,MAAW;AACX,WAAO,OAAO;AAAA;AAGlB,MAAI;AACJ,MAAI,eAAe;AAEnB,kBAAgB;AACZ,WAAO,YAAY;AAAA;AAKvB,SAAO,iBAAiB,aAAa,CAAC,MAAM;AAGxC,QAAI,OAAO,MAAM,MAAM,YAAY;AAC/B,aAAO,YAAY,YAAY,OAAO,MAAM,MAAM;AAClD,QAAE;AACF;AAAA;AAIJ,QAAI,iBAAiB,EAAE;AACvB,WAAO,kBAAkB,MAAM;AAC3B,UAAI,eAAe,aAAa,uBAAuB;AACnD;AAAA,iBACO,eAAe,aAAa,oBAAoB;AACvD,YAAI,OAAO,MAAM,MAAM,sBAAsB;AAEzC,cAAI,EAAE,UAAU,EAAE,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,cAAc;AACvE;AAAA;AAAA;AAGR,YAAI,IAAI,OAAO,YAAY,eAAe,OAAO,MAAM,MAAM,iBAAiB;AAC1E,uBAAa;AACb;AAAA;AAEJ,sBAAc,WAAW,MAAM,OAAO,MAAM,MAAM;AAClD,uBAAe,IAAI,OAAO;AAC1B,UAAE;AACF;AAAA;AAEJ,uBAAiB,eAAe;AAAA;AAAA;AAIxC,qBAAmB,QAAQ;AACvB,aAAS,KAAK,MAAM,SAAS,UAAU,OAAO,MAAM,MAAM;AAC1D,WAAO,MAAM,MAAM,aAAa;AAAA;AAGpC,SAAO,iBAAiB,aAAa,SAAU,GAAG;AAC9C,QAAI,CAAC,OAAO,MAAM,MAAM,cAAc;AAClC;AAAA;AAEJ,QAAI,OAAO,MAAM,MAAM,iBAAiB,MAAM;AAC1C,aAAO,MAAM,MAAM,gBAAgB,SAAS,KAAK,MAAM;AAAA;AAE3D,QAAI,OAAO,aAAa,EAAE,UAAU,OAAO,MAAM,MAAM,mBAAmB,OAAO,cAAc,EAAE,UAAU,OAAO,MAAM,MAAM,iBAAiB;AAC3I,eAAS,KAAK,MAAM,SAAS;AAAA;AAEjC,QAAI,cAAc,OAAO,aAAa,EAAE,UAAU,OAAO,MAAM,MAAM;AACrE,QAAI,aAAa,EAAE,UAAU,OAAO,MAAM,MAAM;AAChD,QAAI,YAAY,EAAE,UAAU,OAAO,MAAM,MAAM;AAC/C,QAAI,eAAe,OAAO,cAAc,EAAE,UAAU,OAAO,MAAM,MAAM;AAGvE,QAAI,CAAC,cAAc,CAAC,eAAe,CAAC,aAAa,CAAC,gBAAgB,OAAO,MAAM,MAAM,eAAe,QAAW;AAC3G;AAAA,eACO,eAAe;AAAc,gBAAU;AAAA,aACzC,cAAc;AAAc,gBAAU;AAAA,aACtC,cAAc;AAAW,gBAAU;AAAA,aACnC,aAAa;AAAa,gBAAU;AAAA,aACpC;AAAY,gBAAU;AAAA,aACtB;AAAW,gBAAU;AAAA,aACrB;AAAc,gBAAU;AAAA,aACxB;AAAa,gBAAU;AAAA;AAKpC,SAAO,iBAAiB,eAAe,SAAU,GAAG;AAChD,QAAI,OAAO,MAAM,MAAM,gCAAgC;AACnD,QAAE;AAAA;AAAA;",
  "names": []
}
 diff --git a/v2/internal/frontend/runtime/runtime_prod_desktop.js b/v2/internal/frontend/runtime/runtime_prod_desktop.js index c98ae9063..51ef29128 100644 --- a/v2/internal/frontend/runtime/runtime_prod_desktop.js +++ b/v2/internal/frontend/runtime/runtime_prod_desktop.js @@ -1 +1 @@ -(()=>{var m=Object.defineProperty;var D=e=>m(e,"__esModule",{value:!0});var W=(e,n)=>{D(e);for(var o in n)m(e,o,{get:n[o],enumerable:!0})};var g={};W(g,{LogDebug:()=>B,LogError:()=>J,LogFatal:()=>G,LogInfo:()=>A,LogLevel:()=>U,LogPrint:()=>R,LogTrace:()=>C,LogWarning:()=>H,SetLogLevel:()=>M});function w(e,n){window.WailsInvoke("L"+e+n)}function C(e){w("T",e)}function R(e){w("P",e)}function B(e){w("D",e)}function A(e){w("I",e)}function H(e){w("W",e)}function J(e){w("E",e)}function G(e){w("F",e)}function M(e){w("S",e)}var U={TRACE:1,DEBUG:2,INFO:3,WARNING:4,ERROR:5};var k=class{constructor(n,o){o=o||-1,this.Callback=i=>(n.apply(null,i),o===-1?!1:(o-=1,o===0))}},s={};function c(e,n,o){s[e]=s[e]||[];let i=new k(n,o);s[e].push(i)}function b(e,n){c(e,n,-1)}function E(e,n){c(e,n,1)}function I(e){let n=e.name;if(s[n]){let o=s[n].slice();for(let i=0;i0&&(a=setTimeout(function(){t(Error("Call to "+e+" timed out. Request ID: "+r))},o)),f[r]={timeoutHandle:a,reject:t,resolve:i};try{let u={name:e,args:n,callbackID:r};window.WailsInvoke("C"+JSON.stringify(u))}catch(u){console.error(u)}})}function T(e){let n;try{n=JSON.parse(e)}catch(t){let r=`Invalid JSON passed to callback: ${t.message}. Message: ${e}`;throw runtime.LogDebug(r),new Error(r)}let o=n.callbackid,i=f[o];if(!i){let t=`Callback '${o}' not registered!!!`;throw console.error(t),new Error(t)}clearTimeout(i.timeoutHandle),delete f[o],n.error?i.reject(n.error):i.resolve(n.result)}window.go={};function L(e){try{e=JSON.parse(e)}catch(n){console.error(n)}window.go=window.go||{},Object.keys(e).forEach(n=>{window.go[n]=window.go[n]||{},Object.keys(e[n]).forEach(o=>{window.go[n][o]=window.go[n][o]||{},Object.keys(e[n][o]).forEach(i=>{window.go[n][o][i]=function(){let t=0;function r(){let a=[].slice.call(arguments);return d([n,o,i].join("."),a,t)}return r.setTimeout=function(a){t=a},r.getTimeout=function(){return t},r}()})})})}var v={};W(v,{WindowCenter:()=>V,WindowFullscreen:()=>N,WindowGetPosition:()=>ie,WindowGetSize:()=>_,WindowHide:()=>te,WindowMaximise:()=>se,WindowMinimise:()=>ae,WindowReload:()=>j,WindowReloadApp:()=>X,WindowSetDarkTheme:()=>Q,WindowSetLightTheme:()=>$,WindowSetMaxSize:()=>ee,WindowSetMinSize:()=>ne,WindowSetPosition:()=>oe,WindowSetRGBA:()=>fe,WindowSetSize:()=>K,WindowSetSystemDefaultTheme:()=>Y,WindowSetTitle:()=>q,WindowShow:()=>re,WindowToggleMaximise:()=>le,WindowUnfullscreen:()=>Z,WindowUnmaximise:()=>we,WindowUnminimise:()=>de});function j(){window.location.reload()}function X(){window.WailsInvoke("WR")}function Y(){window.WailsInvoke("WASDT")}function $(){window.WailsInvoke("WALT")}function Q(){window.WailsInvoke("WADT")}function V(){window.WailsInvoke("Wc")}function q(e){window.WailsInvoke("WT"+e)}function N(){window.WailsInvoke("WF")}function Z(){window.WailsInvoke("Wf")}function K(e,n){window.WailsInvoke("Ws:"+e+":"+n)}function _(){return d(":wails:WindowGetSize")}function ee(e,n){window.WailsInvoke("WZ:"+e+":"+n)}function ne(e,n){window.WailsInvoke("Wz:"+e+":"+n)}function oe(e,n){window.WailsInvoke("Wp:"+e+":"+n)}function ie(){return d(":wails:WindowGetPos")}function te(){window.WailsInvoke("WH")}function re(){window.WailsInvoke("WS")}function se(){window.WailsInvoke("WM")}function le(){window.WailsInvoke("Wt")}function we(){window.WailsInvoke("WU")}function ae(){window.WailsInvoke("Wm")}function de(){window.WailsInvoke("Wu")}function fe(e,n,o,i){let t=JSON.stringify({r:e||0,g:n||0,b:o||0,a:i||255});window.WailsInvoke("Wr:"+t)}var x={};W(x,{BrowserOpenURL:()=>ce});function ce(e){window.WailsInvoke("BO:"+e)}function ue(){window.WailsInvoke("Q")}function We(){return d(":wails:Environment")}window.runtime={...g,...v,...x,EventsOn:b,EventsOnce:E,EventsOnMultiple:c,EventsEmit:S,EventsOff:y,Environment:We,Quit:ue};window.wails={Callback:T,EventsNotify:h,SetBindings:L,eventListeners:s,callbacks:f,flags:{disableScrollbarDrag:!1,disableWailsDefaultContextMenu:!1,enableResize:!1,defaultCursor:null,borderThickness:6,dbClickInterval:100}};window.wails.SetBindings(window.wailsbindings);delete window.wails.SetBindings;var O,z=0;function ge(){window.WailsInvoke("drag")}window.addEventListener("mousedown",e=>{if(window.wails.flags.resizeEdge){window.WailsInvoke("resize:"+window.wails.flags.resizeEdge),e.preventDefault();return}let n=e.target;for(;n!=null&&!n.hasAttribute("data-wails-no-drag");){if(n.hasAttribute("data-wails-drag")){if(window.wails.flags.disableScrollbarDrag&&(e.offsetX>e.target.clientWidth||e.offsetY>e.target.clientHeight))break;if(new Date().getTime()-z{var k=Object.defineProperty;var D=e=>k(e,"__esModule",{value:!0});var W=(e,n)=>{D(e);for(var o in n)k(e,o,{get:n[o],enumerable:!0})};var g={};W(g,{LogDebug:()=>B,LogError:()=>J,LogFatal:()=>M,LogInfo:()=>A,LogLevel:()=>U,LogPrint:()=>R,LogTrace:()=>C,LogWarning:()=>H,SetLogLevel:()=>P});function w(e,n){window.WailsInvoke("L"+e+n)}function C(e){w("T",e)}function R(e){w("P",e)}function B(e){w("D",e)}function A(e){w("I",e)}function H(e){w("W",e)}function J(e){w("E",e)}function M(e){w("F",e)}function P(e){w("S",e)}var U={TRACE:1,DEBUG:2,INFO:3,WARNING:4,ERROR:5};var m=class{constructor(n,o){o=o||-1,this.Callback=i=>(n.apply(null,i),o===-1?!1:(o-=1,o===0))}},s={};function c(e,n,o){s[e]=s[e]||[];let i=new m(n,o);s[e].push(i)}function b(e,n){c(e,n,-1)}function E(e,n){c(e,n,1)}function I(e){let n=e.name;if(s[n]){let o=s[n].slice();for(let i=0;i0&&(a=setTimeout(function(){t(Error("Call to "+e+" timed out. Request ID: "+r))},o)),f[r]={timeoutHandle:a,reject:t,resolve:i};try{let u={name:e,args:n,callbackID:r};window.WailsInvoke("C"+JSON.stringify(u))}catch(u){console.error(u)}})}function T(e){let n;try{n=JSON.parse(e)}catch(t){let r=`Invalid JSON passed to callback: ${t.message}. Message: ${e}`;throw runtime.LogDebug(r),new Error(r)}let o=n.callbackid,i=f[o];if(!i){let t=`Callback '${o}' not registered!!!`;throw console.error(t),new Error(t)}clearTimeout(i.timeoutHandle),delete f[o],n.error?i.reject(n.error):i.resolve(n.result)}window.go={};function L(e){try{e=JSON.parse(e)}catch(n){console.error(n)}window.go=window.go||{},Object.keys(e).forEach(n=>{window.go[n]=window.go[n]||{},Object.keys(e[n]).forEach(o=>{window.go[n][o]=window.go[n][o]||{},Object.keys(e[n][o]).forEach(i=>{window.go[n][o][i]=function(){let t=0;function r(){let a=[].slice.call(arguments);return d([n,o,i].join("."),a,t)}return r.setTimeout=function(a){t=a},r.getTimeout=function(){return t},r}()})})})}var v={};W(v,{WindowCenter:()=>V,WindowFullscreen:()=>N,WindowGetPosition:()=>te,WindowGetSize:()=>_,WindowHide:()=>re,WindowMaximise:()=>le,WindowMinimise:()=>de,WindowReload:()=>j,WindowReloadApp:()=>X,WindowSetAlwaysOnTop:()=>oe,WindowSetBackgroundColour:()=>ce,WindowSetDarkTheme:()=>Q,WindowSetLightTheme:()=>$,WindowSetMaxSize:()=>ee,WindowSetMinSize:()=>ne,WindowSetPosition:()=>ie,WindowSetSize:()=>K,WindowSetSystemDefaultTheme:()=>Y,WindowSetTitle:()=>q,WindowShow:()=>se,WindowToggleMaximise:()=>we,WindowUnfullscreen:()=>Z,WindowUnmaximise:()=>ae,WindowUnminimise:()=>fe});function j(){window.location.reload()}function X(){window.WailsInvoke("WR")}function Y(){window.WailsInvoke("WASDT")}function $(){window.WailsInvoke("WALT")}function Q(){window.WailsInvoke("WADT")}function V(){window.WailsInvoke("Wc")}function q(e){window.WailsInvoke("WT"+e)}function N(){window.WailsInvoke("WF")}function Z(){window.WailsInvoke("Wf")}function K(e,n){window.WailsInvoke("Ws:"+e+":"+n)}function _(){return d(":wails:WindowGetSize")}function ee(e,n){window.WailsInvoke("WZ:"+e+":"+n)}function ne(e,n){window.WailsInvoke("Wz:"+e+":"+n)}function oe(e){window.WailsInvoke("WATP:"+(e?"1":"0"))}function ie(e,n){window.WailsInvoke("Wp:"+e+":"+n)}function te(){return d(":wails:WindowGetPos")}function re(){window.WailsInvoke("WH")}function se(){window.WailsInvoke("WS")}function le(){window.WailsInvoke("WM")}function we(){window.WailsInvoke("Wt")}function ae(){window.WailsInvoke("WU")}function de(){window.WailsInvoke("Wm")}function fe(){window.WailsInvoke("Wu")}function ce(e,n,o,i){let t=JSON.stringify({r:e||0,g:n||0,b:o||0,a:i||255});window.WailsInvoke("Wr:"+t)}var x={};W(x,{BrowserOpenURL:()=>ue});function ue(e){window.WailsInvoke("BO:"+e)}function We(){window.WailsInvoke("Q")}function ge(){return d(":wails:Environment")}window.runtime={...g,...v,...x,EventsOn:b,EventsOnce:E,EventsOnMultiple:c,EventsEmit:S,EventsOff:y,Environment:ge,Quit:We};window.wails={Callback:T,EventsNotify:h,SetBindings:L,eventListeners:s,callbacks:f,flags:{disableScrollbarDrag:!1,disableWailsDefaultContextMenu:!1,enableResize:!1,defaultCursor:null,borderThickness:6,dbClickInterval:100}};window.wails.SetBindings(window.wailsbindings);delete window.wails.SetBindings;var O,z=0;function pe(){window.WailsInvoke("drag")}window.addEventListener("mousedown",e=>{if(window.wails.flags.resizeEdge){window.WailsInvoke("resize:"+window.wails.flags.resizeEdge),e.preventDefault();return}let n=e.target;for(;n!=null&&!n.hasAttribute("data-wails-no-drag");){if(n.hasAttribute("data-wails-drag")){if(window.wails.flags.disableScrollbarDrag&&(e.offsetX>e.target.clientWidth||e.offsetY>e.target.clientHeight))break;if(new Date().getTime()-z; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. diff --git a/v2/internal/frontend/runtime/wrapper/runtime.js b/v2/internal/frontend/runtime/wrapper/runtime.js index 8f47e62f1..73f607ba7 100644 --- a/v2/internal/frontend/runtime/wrapper/runtime.js +++ b/v2/internal/frontend/runtime/wrapper/runtime.js @@ -41,7 +41,7 @@ export function EventsOnMultiple(eventName, callback, maxCallbacks) { } export function EventsOn(eventName, callback) { - OnMultiple(eventName, callback, -1); + EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName) { @@ -49,7 +49,7 @@ export function EventsOff(eventName) { } export function EventsOnce(eventName, callback) { - OnMultiple(eventName, callback, 1); + EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { @@ -145,8 +145,8 @@ export function WindowUnminimise() { window.runtime.WindowUnminimise(); } -export function WindowSetRGBA(RGBA) { - window.runtime.WindowSetRGBA(RGBA); +export function WindowSetBackgroundColour(R, G, B, A) { + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function BrowserOpenURL(url) { diff --git a/v2/internal/go-common-file-dialog/LICENSE b/v2/internal/go-common-file-dialog/LICENSE new file mode 100644 index 000000000..508b6978e --- /dev/null +++ b/v2/internal/go-common-file-dialog/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Harry Phillips + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/v2/internal/go-common-file-dialog/README.md b/v2/internal/go-common-file-dialog/README.md new file mode 100644 index 000000000..1cb5902d1 --- /dev/null +++ b/v2/internal/go-common-file-dialog/README.md @@ -0,0 +1,31 @@ +# Common File Dialog bindings for Golang + +[Project Home](https://github.com/harry1453/go-common-file-dialog) + +This library contains bindings for Windows Vista and +newer's [Common File Dialogs](https://docs.microsoft.com/en-us/windows/win32/shell/common-file-dialog), which is the +standard system dialog for selecting files or folders to open or save. + +The Common File Dialogs have to be accessed via +the [COM Interface](https://en.wikipedia.org/wiki/Component_Object_Model), normally via C++ or via bindings (like in C#) +. + +This library contains bindings for Golang. **It does not require CGO**, and contains empty stubs for non-windows +platforms (so is safe to compile and run on platforms other than windows, but will just return errors at runtime). + +This can be very useful if you want to quickly get a file selector in your Golang application. The `cfdutil` package +contains utility functions with a single call to open and configure a dialog, and then get the result from it. Examples +for this are in [`_examples/usingutil`](_examples/usingutil). Or, if you want finer control over the dialog's operation, +you can use the base package. Examples for this are in [`_examples/notusingutil`](_examples/notusingutil). + +This library is available under the MIT license. + +Currently supported features: + +* Open File Dialog (to open a single file) +* Open Multiple Files Dialog (to open multiple files) +* Open Folder Dialog +* Save File Dialog +* Dialog "roles" to allow Windows to remember different "last locations" for different types of dialog +* Set dialog Title, Default Folder and Initial Folder +* Set dialog File Filters diff --git a/v2/internal/go-common-file-dialog/cfd/CommonFileDialog.go b/v2/internal/go-common-file-dialog/cfd/CommonFileDialog.go new file mode 100644 index 000000000..58e97aa4e --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/CommonFileDialog.go @@ -0,0 +1,72 @@ +// Cross-platform. + +// Common File Dialogs +package cfd + +type Dialog interface { + // Show the dialog to the user. + // Blocks until the user has closed the dialog. + Show() error + // Sets the dialog's parent window. Use 0 to set the dialog to have no parent window. + SetParentWindowHandle(hwnd uintptr) + // Show the dialog to the user. + // Blocks until the user has closed the dialog and returns their selection. + // Returns an error if the user cancelled the dialog. + // Do not use for the Open Multiple Files dialog. Use ShowAndGetResults instead. + ShowAndGetResult() (string, error) + // Sets the title of the dialog window. + SetTitle(title string) error + // Sets the "role" of the dialog. This is used to derive the dialog's GUID, which the + // OS will use to differentiate it from dialogs that are intended for other purposes. + // This means that, for example, a dialog with role "Import" will have a different + // previous location that it will open to than a dialog with role "Open". Can be any string. + SetRole(role string) error + // Sets the folder used as a default if there is not a recently used folder value available + SetDefaultFolder(defaultFolder string) error + // Sets the folder that the dialog always opens to. + // If this is set, it will override the "default folder" behaviour and the dialog will always open to this folder. + SetFolder(folder string) error + // Gets the selected file or folder path, as an absolute path eg. "C:\Folder\file.txt" + // Do not use for the Open Multiple Files dialog. Use GetResults instead. + GetResult() (string, error) + // Sets the file name, I.E. the contents of the file name text box. + // For Select Folder Dialog, sets folder name. + SetFileName(fileName string) error + // Release the resources allocated to this Dialog. + // Should be called when the dialog is finished with. + Release() error +} + +type FileDialog interface { + Dialog + // Set the list of file filters that the user can select. + SetFileFilters(fileFilter []FileFilter) error + // Set the selected item from the list of file filters (set using SetFileFilters) by its index. Defaults to 0 (the first item in the list) if not called. + SetSelectedFileFilterIndex(index uint) error + // Sets the default extension applied when a user does not provide one as part of the file name. + // If the user selects a different file filter, the default extension will be automatically updated to match the new file filter. + // For Open / Open Multiple File Dialog, this only has an effect when the user specifies a file name with no extension and a file with the default extension exists. + // For Save File Dialog, this extension will be used whenever a user does not specify an extension. + SetDefaultExtension(defaultExtension string) error +} + +type OpenFileDialog interface { + FileDialog +} + +type OpenMultipleFilesDialog interface { + FileDialog + // Show the dialog to the user. + // Blocks until the user has closed the dialog and returns the selected files. + ShowAndGetResults() ([]string, error) + // Gets the selected file paths, as absolute paths eg. "C:\Folder\file.txt" + GetResults() ([]string, error) +} + +type SelectFolderDialog interface { + Dialog +} + +type SaveFileDialog interface { // TODO Properties + FileDialog +} diff --git a/v2/internal/go-common-file-dialog/cfd/CommonFileDialog_nonWindows.go b/v2/internal/go-common-file-dialog/cfd/CommonFileDialog_nonWindows.go new file mode 100644 index 000000000..3ab969850 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/CommonFileDialog_nonWindows.go @@ -0,0 +1,28 @@ +//go:build !windows +// +build !windows + +package cfd + +import "fmt" + +var unsupportedError = fmt.Errorf("common file dialogs are only available on windows") + +// TODO doc +func NewOpenFileDialog(config DialogConfig) (OpenFileDialog, error) { + return nil, unsupportedError +} + +// TODO doc +func NewOpenMultipleFilesDialog(config DialogConfig) (OpenMultipleFilesDialog, error) { + return nil, unsupportedError +} + +// TODO doc +func NewSelectFolderDialog(config DialogConfig) (SelectFolderDialog, error) { + return nil, unsupportedError +} + +// TODO doc +func NewSaveFileDialog(config DialogConfig) (SaveFileDialog, error) { + return nil, unsupportedError +} diff --git a/v2/internal/go-common-file-dialog/cfd/CommonFileDialog_windows.go b/v2/internal/go-common-file-dialog/cfd/CommonFileDialog_windows.go new file mode 100644 index 000000000..69f46118e --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/CommonFileDialog_windows.go @@ -0,0 +1,79 @@ +//go:build windows +// +build windows + +package cfd + +import "github.com/go-ole/go-ole" + +func initialize() { + // Swallow error + _ = ole.CoInitializeEx(0, ole.COINIT_APARTMENTTHREADED|ole.COINIT_DISABLE_OLE1DDE) +} + +// TODO doc +func NewOpenFileDialog(config DialogConfig) (OpenFileDialog, error) { + initialize() + + openDialog, err := newIFileOpenDialog() + if err != nil { + return nil, err + } + err = config.apply(openDialog) + if err != nil { + return nil, err + } + return openDialog, nil +} + +// TODO doc +func NewOpenMultipleFilesDialog(config DialogConfig) (OpenMultipleFilesDialog, error) { + initialize() + + openDialog, err := newIFileOpenDialog() + if err != nil { + return nil, err + } + err = config.apply(openDialog) + if err != nil { + return nil, err + } + err = openDialog.setIsMultiselect(true) + if err != nil { + return nil, err + } + return openDialog, nil +} + +// TODO doc +func NewSelectFolderDialog(config DialogConfig) (SelectFolderDialog, error) { + initialize() + + openDialog, err := newIFileOpenDialog() + if err != nil { + return nil, err + } + err = config.apply(openDialog) + if err != nil { + return nil, err + } + err = openDialog.setPickFolders(true) + if err != nil { + return nil, err + } + return openDialog, nil +} + +// TODO doc +func NewSaveFileDialog(config DialogConfig) (SaveFileDialog, error) { + initialize() + + saveDialog, err := newIFileSaveDialog() + if err != nil { + return nil, err + } + err = config.apply(saveDialog) + if err != nil { + return nil, err + } + return saveDialog, nil +} diff --git a/v2/internal/go-common-file-dialog/cfd/DialogConfig.go b/v2/internal/go-common-file-dialog/cfd/DialogConfig.go new file mode 100644 index 000000000..221dbef27 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/DialogConfig.go @@ -0,0 +1,120 @@ +// Cross-platform. + +package cfd + +type FileFilter struct { + // The display name of the filter (That is shown to the user) + DisplayName string + // The filter pattern. Eg. "*.txt;*.png" to select all txt and png files, "*.*" to select any files, etc. + Pattern string +} + +type DialogConfig struct { + // The title of the dialog + Title string + // The role of the dialog. This is used to derive the dialog's GUID, which the + // OS will use to differentiate it from dialogs that are intended for other purposes. + // This means that, for example, a dialog with role "Import" will have a different + // previous location that it will open to than a dialog with role "Open". Can be any string. + Role string + // The default folder - the folder that is used the first time the user opens it + // (after the first time their last used location is used). + DefaultFolder string + // The initial folder - the folder that the dialog always opens to if not empty. + // If this is not empty, it will override the "default folder" behaviour and + // the dialog will always open to this folder. + Folder string + // The file filters that restrict which types of files the dialog is able to choose. + // Ignored by Select Folder Dialog. + FileFilters []FileFilter + // Sets the initially selected file filter. This is an index of FileFilters. + // Ignored by Select Folder Dialog. + SelectedFileFilterIndex uint + // The initial name of the file (I.E. the text in the file name text box) when the user opens the dialog. + // For the Select Folder Dialog, this sets the initial folder name. + FileName string + // The default extension applied when a user does not provide one as part of the file name. + // If the user selects a different file filter, the default extension will be automatically updated to match the new file filter. + // For Open / Open Multiple File Dialog, this only has an effect when the user specifies a file name with no extension and a file with the default extension exists. + // For Save File Dialog, this extension will be used whenever a user does not specify an extension. + // Ignored by Select Folder Dialog. + DefaultExtension string + // ParentWindowHandle is the handle (HWND) to the parent window of the dialog. + // If left as 0 / nil, the dialog will have no parent window. + ParentWindowHandle uintptr +} + +var defaultFilters = []FileFilter{ + { + DisplayName: "All Files (*.*)", + Pattern: "*.*", + }, +} + +func (config *DialogConfig) apply(dialog Dialog) (err error) { + if config.Title != "" { + err = dialog.SetTitle(config.Title) + if err != nil { + return + } + } + + if config.Role != "" { + err = dialog.SetRole(config.Role) + if err != nil { + return + } + } + + if config.Folder != "" { + err = dialog.SetFolder(config.Folder) + if err != nil { + return + } + } + + if config.DefaultFolder != "" { + err = dialog.SetDefaultFolder(config.DefaultFolder) + if err != nil { + return + } + } + + if config.FileName != "" { + err = dialog.SetFileName(config.FileName) + if err != nil { + return + } + } + + dialog.SetParentWindowHandle(config.ParentWindowHandle) + + if dialog, ok := dialog.(FileDialog); ok { + var fileFilters []FileFilter + if config.FileFilters != nil && len(config.FileFilters) > 0 { + fileFilters = config.FileFilters + } else { + fileFilters = defaultFilters + } + err = dialog.SetFileFilters(fileFilters) + if err != nil { + return + } + + if config.SelectedFileFilterIndex != 0 { + err = dialog.SetSelectedFileFilterIndex(config.SelectedFileFilterIndex) + if err != nil { + return + } + } + + if config.DefaultExtension != "" { + err = dialog.SetDefaultExtension(config.DefaultExtension) + if err != nil { + return + } + } + } + + return +} diff --git a/v2/internal/go-common-file-dialog/cfd/errors.go b/v2/internal/go-common-file-dialog/cfd/errors.go new file mode 100644 index 000000000..c097c8eb2 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/errors.go @@ -0,0 +1,7 @@ +package cfd + +import "errors" + +var ( + ErrorCancelled = errors.New("cancelled by user") +) diff --git a/v2/internal/go-common-file-dialog/cfd/iFileOpenDialog.go b/v2/internal/go-common-file-dialog/cfd/iFileOpenDialog.go new file mode 100644 index 000000000..8c82cda2c --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/iFileOpenDialog.go @@ -0,0 +1,197 @@ +//go:build windows +// +build windows + +package cfd + +import ( + "github.com/go-ole/go-ole" + "github.com/wailsapp/wails/v2/internal/go-common-file-dialog/util" + "syscall" + "unsafe" +) + +var ( + fileOpenDialogCLSID = ole.NewGUID("{DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7}") + fileOpenDialogIID = ole.NewGUID("{d57c7288-d4ad-4768-be02-9d969532d960}") +) + +type iFileOpenDialog struct { + vtbl *iFileOpenDialogVtbl + parentWindowHandle uintptr +} + +type iFileOpenDialogVtbl struct { + iFileDialogVtbl + + GetResults uintptr // func (ppenum **IShellItemArray) HRESULT + GetSelectedItems uintptr +} + +func newIFileOpenDialog() (*iFileOpenDialog, error) { + if unknown, err := ole.CreateInstance(fileOpenDialogCLSID, fileOpenDialogIID); err == nil { + return (*iFileOpenDialog)(unsafe.Pointer(unknown)), nil + } else { + return nil, err + } +} + +func (fileOpenDialog *iFileOpenDialog) Show() error { + return fileOpenDialog.vtbl.show(unsafe.Pointer(fileOpenDialog), fileOpenDialog.parentWindowHandle) +} + +func (fileOpenDialog *iFileOpenDialog) SetParentWindowHandle(hwnd uintptr) { + fileOpenDialog.parentWindowHandle = hwnd +} + +func (fileOpenDialog *iFileOpenDialog) ShowAndGetResult() (string, error) { + isMultiselect, err := fileOpenDialog.isMultiselect() + if err != nil { + return "", err + } + if isMultiselect { + // We should panic as this error is caused by the developer using the library + panic("use ShowAndGetResults for open multiple files dialog") + } + if err := fileOpenDialog.Show(); err != nil { + return "", err + } + return fileOpenDialog.GetResult() +} + +func (fileOpenDialog *iFileOpenDialog) ShowAndGetResults() ([]string, error) { + isMultiselect, err := fileOpenDialog.isMultiselect() + if err != nil { + return nil, err + } + if !isMultiselect { + // We should panic as this error is caused by the developer using the library + panic("use ShowAndGetResult for open single file dialog") + } + if err := fileOpenDialog.Show(); err != nil { + return nil, err + } + return fileOpenDialog.GetResults() +} + +func (fileOpenDialog *iFileOpenDialog) SetTitle(title string) error { + return fileOpenDialog.vtbl.setTitle(unsafe.Pointer(fileOpenDialog), title) +} + +func (fileOpenDialog *iFileOpenDialog) GetResult() (string, error) { + isMultiselect, err := fileOpenDialog.isMultiselect() + if err != nil { + return "", err + } + if isMultiselect { + // We should panic as this error is caused by the developer using the library + panic("use GetResults for open multiple files dialog") + } + return fileOpenDialog.vtbl.getResultString(unsafe.Pointer(fileOpenDialog)) +} + +func (fileOpenDialog *iFileOpenDialog) Release() error { + return fileOpenDialog.vtbl.release(unsafe.Pointer(fileOpenDialog)) +} + +func (fileOpenDialog *iFileOpenDialog) SetDefaultFolder(defaultFolderPath string) error { + return fileOpenDialog.vtbl.setDefaultFolder(unsafe.Pointer(fileOpenDialog), defaultFolderPath) +} + +func (fileOpenDialog *iFileOpenDialog) SetFolder(defaultFolderPath string) error { + return fileOpenDialog.vtbl.setFolder(unsafe.Pointer(fileOpenDialog), defaultFolderPath) +} + +func (fileOpenDialog *iFileOpenDialog) SetFileFilters(filter []FileFilter) error { + return fileOpenDialog.vtbl.setFileTypes(unsafe.Pointer(fileOpenDialog), filter) +} + +func (fileOpenDialog *iFileOpenDialog) SetRole(role string) error { + return fileOpenDialog.vtbl.setClientGuid(unsafe.Pointer(fileOpenDialog), util.StringToUUID(role)) +} + +// This should only be callable when the user asks for a multi select because +// otherwise they will be given the Dialog interface which does not expose this function. +func (fileOpenDialog *iFileOpenDialog) GetResults() ([]string, error) { + isMultiselect, err := fileOpenDialog.isMultiselect() + if err != nil { + return nil, err + } + if !isMultiselect { + // We should panic as this error is caused by the developer using the library + panic("use GetResult for open single file dialog") + } + return fileOpenDialog.vtbl.getResultsStrings(unsafe.Pointer(fileOpenDialog)) +} + +func (fileOpenDialog *iFileOpenDialog) SetDefaultExtension(defaultExtension string) error { + return fileOpenDialog.vtbl.setDefaultExtension(unsafe.Pointer(fileOpenDialog), defaultExtension) +} + +func (fileOpenDialog *iFileOpenDialog) SetFileName(initialFileName string) error { + return fileOpenDialog.vtbl.setFileName(unsafe.Pointer(fileOpenDialog), initialFileName) +} + +func (fileOpenDialog *iFileOpenDialog) SetSelectedFileFilterIndex(index uint) error { + return fileOpenDialog.vtbl.setSelectedFileFilterIndex(unsafe.Pointer(fileOpenDialog), index) +} + +func (fileOpenDialog *iFileOpenDialog) setPickFolders(pickFolders bool) error { + const FosPickfolders = 0x20 + if pickFolders { + return fileOpenDialog.vtbl.addOption(unsafe.Pointer(fileOpenDialog), FosPickfolders) + } else { + return fileOpenDialog.vtbl.removeOption(unsafe.Pointer(fileOpenDialog), FosPickfolders) + } +} + +const FosAllowMultiselect = 0x200 + +func (fileOpenDialog *iFileOpenDialog) isMultiselect() (bool, error) { + options, err := fileOpenDialog.vtbl.getOptions(unsafe.Pointer(fileOpenDialog)) + if err != nil { + return false, err + } + return options&FosAllowMultiselect != 0, nil +} + +func (fileOpenDialog *iFileOpenDialog) setIsMultiselect(isMultiselect bool) error { + if isMultiselect { + return fileOpenDialog.vtbl.addOption(unsafe.Pointer(fileOpenDialog), FosAllowMultiselect) + } else { + return fileOpenDialog.vtbl.removeOption(unsafe.Pointer(fileOpenDialog), FosAllowMultiselect) + } +} + +func (vtbl *iFileOpenDialogVtbl) getResults(objPtr unsafe.Pointer) (*iShellItemArray, error) { + var shellItemArray *iShellItemArray + ret, _, _ := syscall.Syscall(vtbl.GetResults, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(&shellItemArray)), + 0) + return shellItemArray, hresultToError(ret) +} + +func (vtbl *iFileOpenDialogVtbl) getResultsStrings(objPtr unsafe.Pointer) ([]string, error) { + shellItemArray, err := vtbl.getResults(objPtr) + if err != nil { + return nil, err + } + if shellItemArray == nil { + return nil, ErrorCancelled + } + defer shellItemArray.vtbl.release(unsafe.Pointer(shellItemArray)) + count, err := shellItemArray.vtbl.getCount(unsafe.Pointer(shellItemArray)) + if err != nil { + return nil, err + } + var results []string + for i := uintptr(0); i < count; i++ { + newItem, err := shellItemArray.vtbl.getItemAt(unsafe.Pointer(shellItemArray), i) + if err != nil { + return nil, err + } + results = append(results, newItem) + } + return results, nil +} diff --git a/v2/internal/go-common-file-dialog/cfd/iFileSaveDialog.go b/v2/internal/go-common-file-dialog/cfd/iFileSaveDialog.go new file mode 100644 index 000000000..3effeda25 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/iFileSaveDialog.go @@ -0,0 +1,93 @@ +//go:build windows +// +build windows + +package cfd + +import ( + "github.com/go-ole/go-ole" + "github.com/wailsapp/wails/v2/internal/go-common-file-dialog/util" + "unsafe" +) + +var ( + saveFileDialogCLSID = ole.NewGUID("{C0B4E2F3-BA21-4773-8DBA-335EC946EB8B}") + saveFileDialogIID = ole.NewGUID("{84bccd23-5fde-4cdb-aea4-af64b83d78ab}") +) + +type iFileSaveDialog struct { + vtbl *iFileSaveDialogVtbl + parentWindowHandle uintptr +} + +type iFileSaveDialogVtbl struct { + iFileDialogVtbl + + SetSaveAsItem uintptr + SetProperties uintptr + SetCollectedProperties uintptr + GetProperties uintptr + ApplyProperties uintptr +} + +func newIFileSaveDialog() (*iFileSaveDialog, error) { + if unknown, err := ole.CreateInstance(saveFileDialogCLSID, saveFileDialogIID); err == nil { + return (*iFileSaveDialog)(unsafe.Pointer(unknown)), nil + } else { + return nil, err + } +} + +func (fileSaveDialog *iFileSaveDialog) Show() error { + return fileSaveDialog.vtbl.show(unsafe.Pointer(fileSaveDialog), fileSaveDialog.parentWindowHandle) +} + +func (fileSaveDialog *iFileSaveDialog) SetParentWindowHandle(hwnd uintptr) { + fileSaveDialog.parentWindowHandle = hwnd +} + +func (fileSaveDialog *iFileSaveDialog) ShowAndGetResult() (string, error) { + if err := fileSaveDialog.Show(); err != nil { + return "", err + } + return fileSaveDialog.GetResult() +} + +func (fileSaveDialog *iFileSaveDialog) SetTitle(title string) error { + return fileSaveDialog.vtbl.setTitle(unsafe.Pointer(fileSaveDialog), title) +} + +func (fileSaveDialog *iFileSaveDialog) GetResult() (string, error) { + return fileSaveDialog.vtbl.getResultString(unsafe.Pointer(fileSaveDialog)) +} + +func (fileSaveDialog *iFileSaveDialog) Release() error { + return fileSaveDialog.vtbl.release(unsafe.Pointer(fileSaveDialog)) +} + +func (fileSaveDialog *iFileSaveDialog) SetDefaultFolder(defaultFolderPath string) error { + return fileSaveDialog.vtbl.setDefaultFolder(unsafe.Pointer(fileSaveDialog), defaultFolderPath) +} + +func (fileSaveDialog *iFileSaveDialog) SetFolder(defaultFolderPath string) error { + return fileSaveDialog.vtbl.setFolder(unsafe.Pointer(fileSaveDialog), defaultFolderPath) +} + +func (fileSaveDialog *iFileSaveDialog) SetFileFilters(filter []FileFilter) error { + return fileSaveDialog.vtbl.setFileTypes(unsafe.Pointer(fileSaveDialog), filter) +} + +func (fileSaveDialog *iFileSaveDialog) SetRole(role string) error { + return fileSaveDialog.vtbl.setClientGuid(unsafe.Pointer(fileSaveDialog), util.StringToUUID(role)) +} + +func (fileSaveDialog *iFileSaveDialog) SetDefaultExtension(defaultExtension string) error { + return fileSaveDialog.vtbl.setDefaultExtension(unsafe.Pointer(fileSaveDialog), defaultExtension) +} + +func (fileSaveDialog *iFileSaveDialog) SetFileName(initialFileName string) error { + return fileSaveDialog.vtbl.setFileName(unsafe.Pointer(fileSaveDialog), initialFileName) +} + +func (fileSaveDialog *iFileSaveDialog) SetSelectedFileFilterIndex(index uint) error { + return fileSaveDialog.vtbl.setSelectedFileFilterIndex(unsafe.Pointer(fileSaveDialog), index) +} diff --git a/v2/internal/go-common-file-dialog/cfd/iShellItem.go b/v2/internal/go-common-file-dialog/cfd/iShellItem.go new file mode 100644 index 000000000..6a747f4d9 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/iShellItem.go @@ -0,0 +1,53 @@ +//go:build windows +// +build windows + +package cfd + +import ( + "github.com/go-ole/go-ole" + "syscall" + "unsafe" +) + +var ( + procSHCreateItemFromParsingName = syscall.NewLazyDLL("Shell32.dll").NewProc("SHCreateItemFromParsingName") + iidShellItem = ole.NewGUID("43826d1e-e718-42ee-bc55-a1e261c37bfe") +) + +type iShellItem struct { + vtbl *iShellItemVtbl +} + +type iShellItemVtbl struct { + iUnknownVtbl + BindToHandler uintptr + GetParent uintptr + GetDisplayName uintptr // func (sigdnName SIGDN, ppszName *LPWSTR) HRESULT + GetAttributes uintptr + Compare uintptr +} + +func newIShellItem(path string) (*iShellItem, error) { + var shellItem *iShellItem + pathPtr := ole.SysAllocString(path) + ret, _, _ := procSHCreateItemFromParsingName.Call( + uintptr(unsafe.Pointer(pathPtr)), + 0, + uintptr(unsafe.Pointer(iidShellItem)), + uintptr(unsafe.Pointer(&shellItem))) + return shellItem, hresultToError(ret) +} + +func (vtbl *iShellItemVtbl) getDisplayName(objPtr unsafe.Pointer) (string, error) { + var ptr *uint16 + ret, _, _ := syscall.Syscall(vtbl.GetDisplayName, + 2, + uintptr(objPtr), + 0x80058000, // SIGDN_FILESYSPATH + uintptr(unsafe.Pointer(&ptr))) + if err := hresultToError(ret); err != nil { + return "", err + } + defer ole.CoTaskMemFree(uintptr(unsafe.Pointer(ptr))) + return ole.LpOleStrToString(ptr), nil +} diff --git a/v2/internal/go-common-file-dialog/cfd/iShellItemArray.go b/v2/internal/go-common-file-dialog/cfd/iShellItemArray.go new file mode 100644 index 000000000..84f26fa20 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/iShellItemArray.go @@ -0,0 +1,67 @@ +//go:build windows +// +build windows + +package cfd + +import ( + "github.com/go-ole/go-ole" + "syscall" + "unsafe" +) + +const ( + iidShellItemArrayGUID = "{b63ea76d-1f85-456f-a19c-48159efa858b}" +) + +var ( + iidShellItemArray *ole.GUID +) + +func init() { + iidShellItemArray, _ = ole.IIDFromString(iidShellItemArrayGUID) +} + +type iShellItemArray struct { + vtbl *iShellItemArrayVtbl +} + +type iShellItemArrayVtbl struct { + iUnknownVtbl + BindToHandler uintptr + GetPropertyStore uintptr + GetPropertyDescriptionList uintptr + GetAttributes uintptr + GetCount uintptr // func (pdwNumItems *DWORD) HRESULT + GetItemAt uintptr // func (dwIndex DWORD, ppsi **IShellItem) HRESULT + EnumItems uintptr +} + +func (vtbl *iShellItemArrayVtbl) getCount(objPtr unsafe.Pointer) (uintptr, error) { + var count uintptr + ret, _, _ := syscall.Syscall(vtbl.GetCount, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(&count)), + 0) + if err := hresultToError(ret); err != nil { + return 0, err + } + return count, nil +} + +func (vtbl *iShellItemArrayVtbl) getItemAt(objPtr unsafe.Pointer, index uintptr) (string, error) { + var shellItem *iShellItem + ret, _, _ := syscall.Syscall(vtbl.GetItemAt, + 2, + uintptr(objPtr), + index, + uintptr(unsafe.Pointer(&shellItem))) + if err := hresultToError(ret); err != nil { + return "", err + } + if shellItem == nil { + return "", ErrorCancelled + } + defer shellItem.vtbl.release(unsafe.Pointer(shellItem)) + return shellItem.vtbl.getDisplayName(unsafe.Pointer(shellItem)) +} diff --git a/v2/internal/go-common-file-dialog/cfd/vtblCommon.go b/v2/internal/go-common-file-dialog/cfd/vtblCommon.go new file mode 100644 index 000000000..21015c27c --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/vtblCommon.go @@ -0,0 +1,48 @@ +//go:build windows +// +build windows + +package cfd + +type comDlgFilterSpec struct { + pszName *int16 + pszSpec *int16 +} + +type iUnknownVtbl struct { + QueryInterface uintptr + AddRef uintptr + Release uintptr +} + +type iModalWindowVtbl struct { + iUnknownVtbl + Show uintptr // func (hwndOwner HWND) HRESULT +} + +type iFileDialogVtbl struct { + iModalWindowVtbl + SetFileTypes uintptr // func (cFileTypes UINT, rgFilterSpec *COMDLG_FILTERSPEC) HRESULT + SetFileTypeIndex uintptr // func(iFileType UINT) HRESULT + GetFileTypeIndex uintptr + Advise uintptr + Unadvise uintptr + SetOptions uintptr // func (fos FILEOPENDIALOGOPTIONS) HRESULT + GetOptions uintptr // func (pfos *FILEOPENDIALOGOPTIONS) HRESULT + SetDefaultFolder uintptr // func (psi *IShellItem) HRESULT + SetFolder uintptr // func (psi *IShellItem) HRESULT + GetFolder uintptr + GetCurrentSelection uintptr + SetFileName uintptr // func (pszName LPCWSTR) HRESULT + GetFileName uintptr + SetTitle uintptr // func(pszTitle LPCWSTR) HRESULT + SetOkButtonLabel uintptr + SetFileNameLabel uintptr + GetResult uintptr // func (ppsi **IShellItem) HRESULT + AddPlace uintptr + SetDefaultExtension uintptr // func (pszDefaultExtension LPCWSTR) HRESULT + // This can only be used from a callback. + Close uintptr + SetClientGuid uintptr // func (guid REFGUID) HRESULT + ClearClientData uintptr + SetFilter uintptr +} diff --git a/v2/internal/go-common-file-dialog/cfd/vtblCommonFunc.go b/v2/internal/go-common-file-dialog/cfd/vtblCommonFunc.go new file mode 100644 index 000000000..a92100010 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfd/vtblCommonFunc.go @@ -0,0 +1,227 @@ +//go:build windows +// +build windows + +package cfd + +import ( + "fmt" + "github.com/go-ole/go-ole" + "strings" + "syscall" + "unsafe" +) + +func hresultToError(hr uintptr) error { + if hr < 0 { + return ole.NewError(hr) + } + return nil +} + +func (vtbl *iUnknownVtbl) release(objPtr unsafe.Pointer) error { + ret, _, _ := syscall.Syscall(vtbl.Release, + 0, + uintptr(objPtr), + 0, + 0) + return hresultToError(ret) +} + +func (vtbl *iModalWindowVtbl) show(objPtr unsafe.Pointer, hwnd uintptr) error { + ret, _, _ := syscall.Syscall(vtbl.Show, + 1, + uintptr(objPtr), + hwnd, + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) setFileTypes(objPtr unsafe.Pointer, filters []FileFilter) error { + cFileTypes := len(filters) + if cFileTypes < 0 { + return fmt.Errorf("must specify at least one filter") + } + comDlgFilterSpecs := make([]comDlgFilterSpec, cFileTypes) + for i := 0; i < cFileTypes; i++ { + filter := &filters[i] + comDlgFilterSpecs[i] = comDlgFilterSpec{ + pszName: ole.SysAllocString(filter.DisplayName), + pszSpec: ole.SysAllocString(filter.Pattern), + } + } + ret, _, _ := syscall.Syscall(vtbl.SetFileTypes, + 2, + uintptr(objPtr), + uintptr(cFileTypes), + uintptr(unsafe.Pointer(&comDlgFilterSpecs[0]))) + return hresultToError(ret) +} + +// Options are: +// FOS_OVERWRITEPROMPT = 0x2, +// FOS_STRICTFILETYPES = 0x4, +// FOS_NOCHANGEDIR = 0x8, +// FOS_PICKFOLDERS = 0x20, +// FOS_FORCEFILESYSTEM = 0x40, +// FOS_ALLNONSTORAGEITEMS = 0x80, +// FOS_NOVALIDATE = 0x100, +// FOS_ALLOWMULTISELECT = 0x200, +// FOS_PATHMUSTEXIST = 0x800, +// FOS_FILEMUSTEXIST = 0x1000, +// FOS_CREATEPROMPT = 0x2000, +// FOS_SHAREAWARE = 0x4000, +// FOS_NOREADONLYRETURN = 0x8000, +// FOS_NOTESTFILECREATE = 0x10000, +// FOS_HIDEMRUPLACES = 0x20000, +// FOS_HIDEPINNEDPLACES = 0x40000, +// FOS_NODEREFERENCELINKS = 0x100000, +// FOS_OKBUTTONNEEDSINTERACTION = 0x200000, +// FOS_DONTADDTORECENT = 0x2000000, +// FOS_FORCESHOWHIDDEN = 0x10000000, +// FOS_DEFAULTNOMINIMODE = 0x20000000, +// FOS_FORCEPREVIEWPANEON = 0x40000000, +// FOS_SUPPORTSTREAMABLEITEMS = 0x80000000 +func (vtbl *iFileDialogVtbl) setOptions(objPtr unsafe.Pointer, options uint32) error { + ret, _, _ := syscall.Syscall(vtbl.SetOptions, + 1, + uintptr(objPtr), + uintptr(options), + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) getOptions(objPtr unsafe.Pointer) (uint32, error) { + var options uint32 + ret, _, _ := syscall.Syscall(vtbl.GetOptions, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(&options)), + 0) + return options, hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) addOption(objPtr unsafe.Pointer, option uint32) error { + if options, err := vtbl.getOptions(objPtr); err == nil { + return vtbl.setOptions(objPtr, options|option) + } else { + return err + } +} + +func (vtbl *iFileDialogVtbl) removeOption(objPtr unsafe.Pointer, option uint32) error { + if options, err := vtbl.getOptions(objPtr); err == nil { + return vtbl.setOptions(objPtr, options&^option) + } else { + return err + } +} + +func (vtbl *iFileDialogVtbl) setDefaultFolder(objPtr unsafe.Pointer, path string) error { + shellItem, err := newIShellItem(path) + if err != nil { + return err + } + defer shellItem.vtbl.release(unsafe.Pointer(shellItem)) + ret, _, _ := syscall.Syscall(vtbl.SetDefaultFolder, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(shellItem)), + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) setFolder(objPtr unsafe.Pointer, path string) error { + shellItem, err := newIShellItem(path) + if err != nil { + return err + } + defer shellItem.vtbl.release(unsafe.Pointer(shellItem)) + ret, _, _ := syscall.Syscall(vtbl.SetFolder, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(shellItem)), + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) setTitle(objPtr unsafe.Pointer, title string) error { + titlePtr := ole.SysAllocString(title) + ret, _, _ := syscall.Syscall(vtbl.SetTitle, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(titlePtr)), + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) close(objPtr unsafe.Pointer) error { + ret, _, _ := syscall.Syscall(vtbl.Close, + 1, + uintptr(objPtr), + 0, + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) getResult(objPtr unsafe.Pointer) (*iShellItem, error) { + var shellItem *iShellItem + ret, _, _ := syscall.Syscall(vtbl.GetResult, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(&shellItem)), + 0) + return shellItem, hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) getResultString(objPtr unsafe.Pointer) (string, error) { + shellItem, err := vtbl.getResult(objPtr) + if err != nil { + return "", err + } + if shellItem == nil { + return "", ErrorCancelled + } + defer shellItem.vtbl.release(unsafe.Pointer(shellItem)) + return shellItem.vtbl.getDisplayName(unsafe.Pointer(shellItem)) +} + +func (vtbl *iFileDialogVtbl) setClientGuid(objPtr unsafe.Pointer, guid *ole.GUID) error { + ret, _, _ := syscall.Syscall(vtbl.SetClientGuid, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(guid)), + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) setDefaultExtension(objPtr unsafe.Pointer, defaultExtension string) error { + if defaultExtension[0] == '.' { + defaultExtension = strings.TrimPrefix(defaultExtension, ".") + } + defaultExtensionPtr := ole.SysAllocString(defaultExtension) + ret, _, _ := syscall.Syscall(vtbl.SetDefaultExtension, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(defaultExtensionPtr)), + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) setFileName(objPtr unsafe.Pointer, fileName string) error { + fileNamePtr := ole.SysAllocString(fileName) + ret, _, _ := syscall.Syscall(vtbl.SetFileName, + 1, + uintptr(objPtr), + uintptr(unsafe.Pointer(fileNamePtr)), + 0) + return hresultToError(ret) +} + +func (vtbl *iFileDialogVtbl) setSelectedFileFilterIndex(objPtr unsafe.Pointer, index uint) error { + ret, _, _ := syscall.Syscall(vtbl.SetFileTypeIndex, + 1, + uintptr(objPtr), + uintptr(index+1), // SetFileTypeIndex counts from 1 + 0) + return hresultToError(ret) +} diff --git a/v2/internal/go-common-file-dialog/cfdutil/CFDUtil.go b/v2/internal/go-common-file-dialog/cfdutil/CFDUtil.go new file mode 100644 index 000000000..bde52d743 --- /dev/null +++ b/v2/internal/go-common-file-dialog/cfdutil/CFDUtil.go @@ -0,0 +1,45 @@ +package cfdutil + +import ( + "github.com/wailsapp/wails/v2/internal/go-common-file-dialog/cfd" +) + +// TODO doc +func ShowOpenFileDialog(config cfd.DialogConfig) (string, error) { + dialog, err := cfd.NewOpenFileDialog(config) + if err != nil { + return "", err + } + defer dialog.Release() + return dialog.ShowAndGetResult() +} + +// TODO doc +func ShowOpenMultipleFilesDialog(config cfd.DialogConfig) ([]string, error) { + dialog, err := cfd.NewOpenMultipleFilesDialog(config) + if err != nil { + return nil, err + } + defer dialog.Release() + return dialog.ShowAndGetResults() +} + +// TODO doc +func ShowPickFolderDialog(config cfd.DialogConfig) (string, error) { + dialog, err := cfd.NewSelectFolderDialog(config) + if err != nil { + return "", err + } + defer dialog.Release() + return dialog.ShowAndGetResult() +} + +// TODO doc +func ShowSaveFileDialog(config cfd.DialogConfig) (string, error) { + dialog, err := cfd.NewSaveFileDialog(config) + if err != nil { + return "", err + } + defer dialog.Release() + return dialog.ShowAndGetResult() +} diff --git a/v2/internal/go-common-file-dialog/util/util.go b/v2/internal/go-common-file-dialog/util/util.go new file mode 100644 index 000000000..723fbedc0 --- /dev/null +++ b/v2/internal/go-common-file-dialog/util/util.go @@ -0,0 +1,10 @@ +package util + +import ( + "github.com/go-ole/go-ole" + "github.com/google/uuid" +) + +func StringToUUID(str string) *ole.GUID { + return ole.NewGUID(uuid.NewSHA1(uuid.Nil, []byte(str)).String()) +} diff --git a/v2/internal/go-common-file-dialog/util/util_test.go b/v2/internal/go-common-file-dialog/util/util_test.go new file mode 100644 index 000000000..2e8ffeb05 --- /dev/null +++ b/v2/internal/go-common-file-dialog/util/util_test.go @@ -0,0 +1,14 @@ +package util + +import ( + "github.com/go-ole/go-ole" + "testing" +) + +func TestStringToUUID(t *testing.T) { + generated := *StringToUUID("TestTestTest") + expected := *ole.NewGUID("7933985F-2C87-5A5B-A26E-5D0326829AC2") + if generated != expected { + t.Errorf("not equal. expected %s, found %s", expected.String(), generated.String()) + } +} diff --git a/v2/internal/gomod/gomod_test.go b/v2/internal/gomod/gomod_test.go index 5173a2230..43907c4a2 100644 --- a/v2/internal/gomod/gomod_test.go +++ b/v2/internal/gomod/gomod_test.go @@ -28,7 +28,6 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -91,7 +90,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -132,7 +131,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -172,7 +171,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -213,7 +212,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -254,7 +253,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -297,7 +296,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -341,7 +340,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -443,7 +442,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -484,7 +483,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -525,7 +524,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect @@ -569,7 +568,7 @@ require ( github.com/klauspost/compress v1.12.2 // indirect github.com/leaanthony/debme v1.2.1 // indirect github.com/leaanthony/go-ansi-parser v1.0.1 // indirect - github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect + github.com/wailsapp/wails/v2/internal/go-common-file-dialog v1.0.3 // indirect github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect github.com/leaanthony/gosod v1.0.3 // indirect github.com/leaanthony/slicer v1.5.0 // indirect diff --git a/v2/internal/menumanager/processedMenu.go b/v2/internal/menumanager/processedMenu.go index 2722f86cd..8d886e19e 100644 --- a/v2/internal/menumanager/processedMenu.go +++ b/v2/internal/menumanager/processedMenu.go @@ -70,7 +70,7 @@ func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *Pr Hidden: menuItem.Hidden, Checked: menuItem.Checked, SubMenu: nil, - //RGBA: menuItem.RGBA, + //BackgroundColour: menuItem.BackgroundColour, //FontSize: menuItem.FontSize, //FontName: menuItem.FontName, //Image: menuItem.Image, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/s/s.go b/v2/internal/s/s.go similarity index 100% rename from v2/cmd/wails/internal/commands/initialise/templates/generate/s/s.go rename to v2/internal/s/s.go diff --git a/v2/internal/signal/signal.go b/v2/internal/signal/signal.go index f6db19cd3..96e10bee6 100644 --- a/v2/internal/signal/signal.go +++ b/v2/internal/signal/signal.go @@ -1,73 +1,39 @@ package signal import ( - "context" "os" gosignal "os/signal" "sync" "syscall" - - "github.com/wailsapp/wails/v2/internal/logger" - "github.com/wailsapp/wails/v2/internal/servicebus" ) -// Manager manages signals such as CTRL-C -type Manager struct { - // Service Bus - bus *servicebus.ServiceBus +var signalChannel = make(chan os.Signal, 2) - // logger - logger logger.CustomLogger +var callbacks []func() +var lock sync.Mutex - // signalChannel - signalchannel chan os.Signal - - // ctx - ctx context.Context - cancel context.CancelFunc - - // Parent waitgroup - wg *sync.WaitGroup -} - -// NewManager creates a new signal manager -func NewManager(ctx context.Context, cancel context.CancelFunc, bus *servicebus.ServiceBus, logger *logger.Logger) (*Manager, error) { - - result := &Manager{ - bus: bus, - logger: logger.CustomLogger("Signal Manager"), - signalchannel: make(chan os.Signal, 2), - ctx: ctx, - cancel: cancel, - wg: ctx.Value("waitgroup").(*sync.WaitGroup), - } - - return result, nil +func OnShutdown(callback func()) { + lock.Lock() + defer lock.Unlock() + callbacks = append(callbacks, callback) } // Start the Signal Manager -func (m *Manager) Start() { +func Start() { // Hook into interrupts - gosignal.Notify(m.signalchannel, os.Interrupt, syscall.SIGTERM, syscall.SIGINT) - - m.wg.Add(1) + gosignal.Notify(signalChannel, os.Interrupt, syscall.SIGTERM, syscall.SIGINT) // Spin off signal listener and wait for either a cancellation // or signal go func() { select { - case <-m.signalchannel: - println() - m.logger.Trace("Ctrl+C detected. Shutting down...") - m.bus.Publish("quit", "ctrl-c pressed") - - // Start shutdown of Wails - m.cancel() - - case <-m.ctx.Done(): + case <-signalChannel: + println("") + println("Ctrl+C detected. Shutting down...") + for _, callback := range callbacks { + callback() + } } - m.logger.Trace("Shutdown") - m.wg.Done() }() } diff --git a/v2/internal/system/packagemanager/apt.go b/v2/internal/system/packagemanager/apt.go index a01c8b03d..a650c754f 100644 --- a/v2/internal/system/packagemanager/apt.go +++ b/v2/internal/system/packagemanager/apt.go @@ -65,7 +65,7 @@ func (a *Apt) PackageInstalled(pkg *Package) (bool, error) { if pkg.SystemPackage == false { return false, nil } - cmd := exec.Command("apt", "-qq", "list", pkg.Name) + cmd := exec.Command("apt", "list", "-qq", pkg.Name) var stdo, stde bytes.Buffer cmd.Stdout = &stdo cmd.Stderr = &stde @@ -79,7 +79,7 @@ func (a *Apt) PackageAvailable(pkg *Package) (bool, error) { if pkg.SystemPackage == false { return false, nil } - stdout, _, err := shell.RunCommand(".", "apt", "-qq", "list", pkg.Name) + stdout, _, err := shell.RunCommand(".", "apt", "list", "-qq", pkg.Name) // We add a space to ensure we get a full match, not partial match output := a.removeEscapeSequences(stdout) installed := strings.HasPrefix(output, pkg.Name) diff --git a/v2/internal/system/system_windows.go b/v2/internal/system/system_windows.go index 4bb6d6707..3d1b8dc79 100644 --- a/v2/internal/system/system_windows.go +++ b/v2/internal/system/system_windows.go @@ -28,8 +28,7 @@ func (i *Info) discover() error { } func checkWebView2() *packagemanager.Dependancy { - - version, _ := webviewloader.GetInstalledVersion() + version, _ := webviewloader.GetWebviewVersion("") installed := version != "" return &packagemanager.Dependancy{ diff --git a/v2/internal/wv2installer/wv2installer.go b/v2/internal/wv2installer/wv2installer.go index e9daae886..1549cf1ba 100644 --- a/v2/internal/wv2installer/wv2installer.go +++ b/v2/internal/wv2installer/wv2installer.go @@ -3,44 +3,57 @@ package wv2installer import ( + "fmt" "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/go-webview2/webviewloader" "github.com/wailsapp/wails/v2/pkg/options" "github.com/wailsapp/wails/v2/pkg/options/windows" ) -const MinimumRuntimeVersion string = "91.0.992.28" +const MinimumRuntimeVersion string = "94.0.992.31" // Webview2 SDK 1.0.992.28 type installationStatus int const ( needsInstalling installationStatus = iota needsUpdating - installed ) func Process(appoptions *options.App) (string, error) { - messages := windows.DefaultMessages() if appoptions.Windows != nil && appoptions.Windows.Messages != nil { messages = appoptions.Windows.Messages } + installStatus := needsInstalling - installedVersion, err := webviewloader.GetInstalledVersion() + + // Override version check for manually specified webview path if present + var webviewPath = "" + if opts := appoptions.Windows; opts != nil && opts.WebviewBrowserPath != "" { + webviewPath = opts.WebviewBrowserPath + } + + installedVersion, err := webviewloader.GetWebviewVersion(webviewPath) if err != nil { return "", err } + if installedVersion != "" { - installStatus = installed + installStatus = needsUpdating compareResult, err := webviewloader.CompareBrowserVersions(installedVersion, MinimumRuntimeVersion) if err != nil { return "", err } - updateRequired := compareResult == -1 + updateRequired := compareResult < 0 // Installed and does not require updating if !updateRequired { return installedVersion, nil } - } + + // Force error strategy if webview is manually specified + if webviewPath != "" { + return installedVersion, fmt.Errorf(messages.InvalidFixedWebview2) + } + return installedVersion, doInstallationStrategy(installStatus, messages) } diff --git a/v2/pkg/commands/build/base.go b/v2/pkg/commands/build/base.go index 9bb19be57..351d944fc 100644 --- a/v2/pkg/commands/build/base.go +++ b/v2/pkg/commands/build/base.go @@ -182,6 +182,10 @@ func (b *BaseBuilder) CompileProject(options *Options) error { commands.Add("-trimpath") } + if options.RaceDetector { + commands.Add("-race") + } + var tags slicer.StringSlicer tags.Add(options.OutputType) tags.AddSlice(options.UserTags) @@ -213,7 +217,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error { if options.Mode == Production { ldflags.Add("-w", "-s") - if options.Platform == "windows" { + if options.Platform == "windows" && !options.WindowsConsole { ldflags.Add("-H windowsgui") } } diff --git a/v2/pkg/commands/build/build.go b/v2/pkg/commands/build/build.go index 091de85e2..edc233b57 100644 --- a/v2/pkg/commands/build/build.go +++ b/v2/pkg/commands/build/build.go @@ -56,6 +56,8 @@ type Options struct { ForceBuild bool // Force BundleName string // Bundlename for Mac TrimPath bool // Use Go's trimpath compiler flag + RaceDetector bool // Build with Go's race detector + WindowsConsole bool // Indicates that the windows console should be kept } // Build the project! diff --git a/v2/pkg/options/options.go b/v2/pkg/options/options.go index 1e0b9dfca..c5e19ba38 100644 --- a/v2/pkg/options/options.go +++ b/v2/pkg/options/options.go @@ -41,18 +41,20 @@ type App struct { StartHidden bool HideWindowOnClose bool AlwaysOnTop bool - RGBA *RGBA - Assets fs.FS - AssetsHandler http.Handler - Menu *menu.Menu - Logger logger.Logger `json:"-"` - LogLevel logger.LogLevel - OnStartup func(ctx context.Context) `json:"-"` - OnDomReady func(ctx context.Context) `json:"-"` - OnShutdown func(ctx context.Context) `json:"-"` - OnBeforeClose func(ctx context.Context) (prevent bool) `json:"-"` - Bind []interface{} - WindowStartState WindowStartState + BackgroundColour *RGBA + // RGBA is deprecated. Please use BackgroundColour + RGBA *RGBA + Assets fs.FS + AssetsHandler http.Handler + Menu *menu.Menu + Logger logger.Logger `json:"-"` + LogLevel logger.LogLevel + OnStartup func(ctx context.Context) `json:"-"` + OnDomReady func(ctx context.Context) `json:"-"` + OnShutdown func(ctx context.Context) `json:"-"` + OnBeforeClose func(ctx context.Context) (prevent bool) `json:"-"` + Bind []interface{} + WindowStartState WindowStartState //ContextMenus []*menu.ContextMenu //TrayMenus []*menu.TrayMenu @@ -75,9 +77,9 @@ func MergeDefaults(appoptions *App) { log.Fatal(err) } - // DEfault colour. Doesn't work well with mergo - if appoptions.RGBA == nil { - appoptions.RGBA = &RGBA{ + // Default colour. Doesn't work well with mergo + if appoptions.BackgroundColour == nil { + appoptions.BackgroundColour = &RGBA{ R: 255, G: 255, B: 255, diff --git a/v2/pkg/options/windows/windows.go b/v2/pkg/options/windows/windows.go index 4c553fc89..5c18d1737 100644 --- a/v2/pkg/options/windows/windows.go +++ b/v2/pkg/options/windows/windows.go @@ -12,6 +12,7 @@ type Messages struct { DownloadPage string PressOKToInstall string ContactAdmin string + InvalidFixedWebview2 string } const ( @@ -23,6 +24,16 @@ const ( Light Theme = 2 ) +type BackdropType int32 + +const ( + Auto BackdropType = 0 + Disable BackdropType = 1 // None + MainWindow BackdropType = 2 // Mica + TransientWindow BackdropType = 3 // Acrylic + TabbedWindow BackdropType = 4 // Tabbed +) + func RGB(r, g, b uint8) int32 { var col = int32(b) col = col<<8 | int32(g) @@ -61,14 +72,29 @@ type Options struct { // If the path is not valid, a messagebox will be displayed with the error and the app will exit with error code. WebviewUserDataPath string + // Path to the directory with WebView2 executables. If empty WebView2 installed in the system will be used. + WebviewBrowserPath string + // Dark/Light or System Default Theme Theme Theme // Custom settings for dark/light mode CustomTheme *ThemeSettings + // Windows 11 22579 minimum + TranslucencyType BackdropType + // User messages that can be customised Messages *Messages + + // ResizeDebounceMS is the amount of time to debounce redraws of webview2 + // when resizing the window + ResizeDebounceMS uint16 + + // OnSuspend is called when Windows enters low power mode + OnSuspend func() + // OnResume is called when Windows resumes from low power mode + OnResume func() } func DefaultMessages() *Messages { @@ -82,5 +108,6 @@ func DefaultMessages() *Messages { DownloadPage: "This application requires the WebView2 runtime. Press OK to open the download page. Minimum version required: ", PressOKToInstall: "Press Ok to install.", ContactAdmin: "The WebView2 runtime is required to run this application. Please contact your system administrator.", + InvalidFixedWebview2: "The WebView2 runtime is manually specified, but It is not valid. Check minimum required version and webview2 path.", } } diff --git a/v2/pkg/runtime/runtime.go b/v2/pkg/runtime/runtime.go index 20e44dc72..6dc61f368 100644 --- a/v2/pkg/runtime/runtime.go +++ b/v2/pkg/runtime/runtime.go @@ -67,12 +67,14 @@ func Quit(ctx context.Context) { appFrontend.Quit() } +// EnvironmentInfo contains information about the environment type EnvironmentInfo struct { - BuildType string `json:"buildtype"` + BuildType string `json:"buildType"` Platform string `json:"platform"` Arch string `json:"arch"` } +// Environment returns information about the environment func Environment(ctx context.Context) EnvironmentInfo { var result EnvironmentInfo buildType := ctx.Value("buildtype") diff --git a/v2/pkg/runtime/window.go b/v2/pkg/runtime/window.go index 178f5abea..fb1cd6126 100644 --- a/v2/pkg/runtime/window.go +++ b/v2/pkg/runtime/window.go @@ -92,6 +92,12 @@ func WindowSetMaxSize(ctx context.Context, width int, height int) { appFrontend.WindowSetMaxSize(width, height) } +// WindowSetAlwaysOnTop sets the window AlwaysOnTop or not on top +func WindowSetAlwaysOnTop(ctx context.Context, b bool) { + appFrontend := getFrontend(ctx) + appFrontend.WindowSetAlwaysOnTop(b) +} + // WindowSetPosition sets the position of the window func WindowSetPosition(ctx context.Context, x int, y int) { appFrontend := getFrontend(ctx) @@ -133,7 +139,8 @@ func WindowUnminimise(ctx context.Context) { appFrontend.WindowUnminimise() } -func WindowSetRGBA(ctx context.Context, R, G, B, A uint8) { +// WindowSetBackgroundColour sets the colour of the window background +func WindowSetBackgroundColour(ctx context.Context, R, G, B, A uint8) { appFrontend := getFrontend(ctx) col := &options.RGBA{ R: R, @@ -141,5 +148,5 @@ func WindowSetRGBA(ctx context.Context, R, G, B, A uint8) { B: B, A: A, } - appFrontend.WindowSetRGBA(col) + appFrontend.WindowSetBackgroundColour(col) } diff --git a/v2/tools/release/release.go b/v2/tools/release/release.go new file mode 100644 index 000000000..c61a1c72a --- /dev/null +++ b/v2/tools/release/release.go @@ -0,0 +1,67 @@ +package main + +import ( + "encoding/json" + "github.com/wailsapp/wails/v2/internal/s" + "os" + "os/exec" + "strconv" + "strings" +) + +const versionFile = "../../cmd/wails/internal/version.txt" + +func checkError(err error) { + if err != nil { + println(err.Error()) + os.Exit(1) + } +} + +func updateVersion() string { + + currentVersionData, err := os.ReadFile(versionFile) + checkError(err) + currentVersion := string(currentVersionData) + vsplit := strings.Split(currentVersion, ".") + minorVersion, err := strconv.Atoi(vsplit[len(vsplit)-1]) + checkError(err) + minorVersion++ + vsplit[len(vsplit)-1] = strconv.Itoa(minorVersion) + newVersion := strings.Join(vsplit, ".") + err = os.WriteFile(versionFile, []byte(newVersion), 0755) + checkError(err) + return newVersion +} + +func main() { + newVersion := updateVersion() + s.CD("../../../website") + s.ECHO("Generating new Docs for version: " + newVersion) + cmd := exec.Command("npm", "run", "docusaurus", "docs:version", newVersion) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + err := cmd.Run() + checkError(err) + + // Load the version list + versionsData, err := os.ReadFile("versions.json") + checkError(err) + var versions []string + err = json.Unmarshal(versionsData, &versions) + checkError(err) + oldestVersion := versions[len(versions)-1] + s.ECHO(oldestVersion) + versions = versions[0 : len(versions)-1] + newVersions, err := json.Marshal(&versions) + checkError(err) + err = os.WriteFile("versions.json", newVersions, 0755) + checkError(err) + + s.ECHO("Removing old version: " + oldestVersion) + s.CD("versioned_docs") + s.RMDIR("version-" + oldestVersion) + s.CD("../versioned_sidebars") + s.RM("version-" + oldestVersion + "-sidebars.json") + +} diff --git a/v2/wails.go b/v2/wails.go index 33d07a561..e35ca82e9 100644 --- a/v2/wails.go +++ b/v2/wails.go @@ -4,12 +4,22 @@ package wails import ( app "github.com/wailsapp/wails/v2/internal/appng" + "github.com/wailsapp/wails/v2/internal/signal" "github.com/wailsapp/wails/v2/pkg/options" ) // Run creates an application based on the given config and executes it func Run(options *options.App) error { + if options.RGBA != nil { + println("---- WARNING ----") + println("The `RGBA` option has been deprecated. Please use `BackgroundColour`.") + + if options.BackgroundColour == nil { + options.BackgroundColour = options.RGBA + } + } + // Call an Init method manually err := Init() if err != nil { @@ -21,5 +31,11 @@ func Run(options *options.App) error { return err } + signal.OnShutdown(func() { + mainapp.Shutdown() + }) + + signal.Start() + return mainapp.Run() } diff --git a/website/docs/community/showcase/october.mdx b/website/docs/community/showcase/october.mdx new file mode 100644 index 000000000..fbabff01e --- /dev/null +++ b/website/docs/community/showcase/october.mdx @@ -0,0 +1,11 @@ +# October + +

+
+

+ +[October](https://october.utf9k.net) is a small Wails application that makes it really easy to extract highlights from [Kobo eReaders](https://en.wikipedia.org/wiki/Kobo_eReader) and then forward them to [Readwise](https://readwise.io). + +It has a relatively small scope with all platform versions weighing in under 10MB, and that's without enabling [UPX compression](https://upx.github.io/)! + +In contrast, the author's previous attempts with Electron quickly bloated to several hundred megabytes. \ No newline at end of file diff --git a/website/docs/community/showcase/surge.mdx b/website/docs/community/showcase/surge.mdx index 774e86e70..b1693a6de 100644 --- a/website/docs/community/showcase/surge.mdx +++ b/website/docs/community/showcase/surge.mdx @@ -5,5 +5,5 @@

-[Surge](https://surge.rule110.io/) is a p2p filesharing app designed to utilize blockchain technologies to enable 100% anonymous file transfers. Surge is end-to-end encrypted, decentralized and open source. +[Surge](https://getsurge.io/) is a p2p filesharing app designed to utilize blockchain technologies to enable 100% anonymous file transfers. Surge is end-to-end encrypted, decentralized and open source. diff --git a/website/docs/community/templates.mdx b/website/docs/community/templates.mdx index 076a6b041..6d090bb3d 100644 --- a/website/docs/community/templates.mdx +++ b/website/docs/community/templates.mdx @@ -35,6 +35,7 @@ If you are unsure about a template, inspect `package.json` and `wails.json` for - [wails-react-template](https://github.com/AlienRecall/wails-react-template) - A template using reactjs - [wails-react-template](https://github.com/flin7/wails-react-template) - A minimal template for React that supports live development +- [wails-template-nextjs](https://github.com/LGiki/wails-template-nextjs) - A template using Next.js and TypeScript ## Svelte diff --git a/website/docs/contributing/_category_.json b/website/docs/contributing/_category_.json new file mode 100644 index 000000000..fad21931a --- /dev/null +++ b/website/docs/contributing/_category_.json @@ -0,0 +1,4 @@ +{ + "label": "Contributing", + "position": 99 +} diff --git a/website/docs/contributing/developing_new_features.mdx b/website/docs/contributing/developing_new_features.mdx new file mode 100644 index 000000000..1aa5ea145 --- /dev/null +++ b/website/docs/contributing/developing_new_features.mdx @@ -0,0 +1,35 @@ +--- +sidebar_position: 20 +--- + +# Developing New Features + +We are always keen to add features to Wails and expand on what the project can do. +The process for adding new features are as follows: + +- Pick an enhancement ticket with the "TODO" label. It's preferable to select one from the current +[Backlog](https://github.com/orgs/wailsapp/projects/1/views/1) but the choice is yours. +- Before developing, check that the ticket includes the following information: +- The purpose of the enhancement +- What is out of scope for the enhancement +- What platforms the enhancement targets (most features should be cross-platform unless there's a very specific reason) +- If the ticket does not include this information, feel free to request the information from the +person who opened the ticket. Sometimes placeholder tickets are created and require more details +- Comment on the ticket stating you wish to develop the feature +- Clone the repository and create a branch with the format `feature/_` +- New features often require documentation so please ensure you have also added or updated the documentation as part of +the changes +- Once the feature is ready for testing, create a draft PR. Please ensure the PR description has the test scenarios and +test cases listed with checkmarks, so that others can know what still needs to be tested. +- Once all the testing is completed, please update the status of the PR from draft and leave a message. + +:::note +There is nothing stopping you from opening a ticket and working on it yourself, but please be aware that all +enhancement requests are reviewed for good fit. Not all ideas will be selected so it's best to have discussion +on the ticket first. +::: + +:::warning +Any PRs opened without a corresponding ticket may be rejected. +::: + diff --git a/website/docs/contributing/documenting.mdx b/website/docs/contributing/documenting.mdx new file mode 100644 index 000000000..1655a44fe --- /dev/null +++ b/website/docs/contributing/documenting.mdx @@ -0,0 +1,39 @@ +--- +sidebar_position: 40 +--- + +# Documenting + +This website is also the main documentation site for the project. Sometimes this gets +out of date and needs some slight adjustments. Some of the documentation isn't written +to the best standards either. Developing documentation is hard and so any contribution +to this is greatly appreciated. Features without documentation are unfinished so to the +project, it's *as important* as the code. + +We generally do not create tickets for updating documentation so if there is text you +think should be updated or rephrased then feel free to submit a PR for that. This site +is in the main repository under the `website` directory. We use [Docusaurus](https://docusaurus.io/) to create +the site so there is plenty of existing documentation and tutorials around to get started. + +To set up a local documentation development environment, do the following: + +- [Install npm](https://docs.npmjs.com/cli/v8/configuring-npm/install) +- `cd website` +- `npm install` +- `npm run start` + +After it has all installed and is running, you should see the site at [`http://localhost:3000`](http://localhost:3000). +Any changes made to the site text will be immediately reflected in the browser. + +## Versioning + +We employ a versioning system where we have the "latest" documentation AKA "Next Version" which +has all the changes that have occurred since the last release. We also keep the last release +documentation as well as the version before that. + +There isn't usually a reason to update released documentation so we don't generally update +the documents in the `versioned_docs` or `versioned_sidebars` directories. + +The "next version" docs are mainly in `website/docs` with some "version independent" documents +in `src/pages`. Any updates should be made in the `website/docs` directory. + diff --git a/website/docs/contributing/fixing_bugs.mdx b/website/docs/contributing/fixing_bugs.mdx new file mode 100644 index 000000000..7e1c78ad3 --- /dev/null +++ b/website/docs/contributing/fixing_bugs.mdx @@ -0,0 +1,30 @@ +--- +sidebar_position: 30 +--- + +# Fixing Bugs + +The process for fixing bugs are as follows: + +- Check the current [Backlog](https://github.com/orgs/wailsapp/projects/1/views/1) and select a bug to fix +- Before developing, check that the ticket includes the following information: +- The scope of the issue including platforms affected +- The steps to reproduce. Sometimes bugs are opened that are not Wails issues and the onus is on the reporter to +prove that it is a Wails issue with a minimal reproducible example +- The output of `wails doctor` +- If the ticket does not include this information, feel free to request the information from the +person who opened the ticket. +- Comment on the ticket stating you wish to develop a fix +- Clone the repository and create a branch with the format `bugfix/_` +- Once the fix is ready for testing, create a draft PR. Please ensure the PR description has the test scenarios and +test cases listed with checkmarks, so that others can know what still needs to be tested. +- Once all the testing is completed, please update the status of the PR from draft and leave a message. + +:::note +There is nothing stopping you from opening a ticket and working on it yourself, but please be aware that all +bugfixes should be discussed as the approach may have unintended side effects. +::: + +:::warning +Any PRs opened without a corresponding ticket may be rejected. +::: \ No newline at end of file diff --git a/website/docs/contributing/helping_others.mdx b/website/docs/contributing/helping_others.mdx new file mode 100644 index 000000000..340f51a2a --- /dev/null +++ b/website/docs/contributing/helping_others.mdx @@ -0,0 +1,17 @@ +--- +sidebar_position: 50 +--- + +# Helping Others + +A great way to contribute to the project is to help others who are experiencing difficulty. +This is normally reported as a ticket or a message on the Wails slack channel. Even just +clarifying the issue can really help out. Sometimes, when an issue is discussed and gets +resolved, we create a guide out of it to help others who face the same issues. + +To join the Wails slack channel, accept the invite [here](https://gophers.slack.com/join/shared_invite/zt-197vymgt3-sJt4oyakb6nqlVKjXTyeVw#/shared-invite/email) +and join us on the channel by following [this link](https://gophers.slack.com/?redir=%2Fmessages%2FCJ4P9F7MZ%2F). + +:::note +Work In Progress +::: diff --git a/website/docs/contributing/introduction.mdx b/website/docs/contributing/introduction.mdx new file mode 100644 index 000000000..53763adff --- /dev/null +++ b/website/docs/contributing/introduction.mdx @@ -0,0 +1,24 @@ +--- +sidebar_position: 1 +--- + +# Introduction + +Wails is an open source, community driven project. We welcome anyone to join us in +contributing to the project. This documentation is aimed at anyone wishing to get +familiar with the project and the development processes. + +# Ways of contributing + +There are many ways to contribute to the project: + +- Developing new features +- Fixing bugs +- Testing +- Documenting features +- Writing tutorials / guides +- Helping others on the issues + discussions boards + +Guides for these have been created in their own sections. Before getting started, +please introduce yourself in the [Contributing to Wails](https://github.com/wailsapp/wails/discussions/1520) +discussion. \ No newline at end of file diff --git a/website/docs/contributing/setting_up_a_dev_environment.mdx b/website/docs/contributing/setting_up_a_dev_environment.mdx new file mode 100644 index 000000000..b5cfd8eca --- /dev/null +++ b/website/docs/contributing/setting_up_a_dev_environment.mdx @@ -0,0 +1,34 @@ +--- +sidebar_position: 10 +--- + +# Setting up a Development Environment + +You can set up a development environment by doing the following: + +- Install the latest versions of Go and Git +- `git clone https://github.com/wailsapp/wails` +- `cd wails/v2/cmd/wails` +- `go install` + +NOTE: The directory that you cloned the project into will now be called "clonedir". + +The Wails CLI will now be at the very latest version. + +To update projects to use the latest version, update the project's `go.mod` and +ensure the following line is at the bottom of the file: + +`replace github.com/wailsapp/wails/v2 => ` + +Example: + +On Windows: +`replace github.com/wailsapp/wails/v2 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2` + +On 'nix: +`replace github.com/wailsapp/wails/v2 => /home/me/projects/wails/v2` + +To revert back to a stable version, run: + +`go install github.com/wailsapp/wails/v2/cmd/wails@latest` + diff --git a/website/docs/contributing/testing.mdx b/website/docs/contributing/testing.mdx new file mode 100644 index 000000000..d01204651 --- /dev/null +++ b/website/docs/contributing/testing.mdx @@ -0,0 +1,21 @@ +--- +sidebar_position: 35 +--- + +# Testing + +Testing is vitally important to ensure quality in the project. There are a couple of +scenarios where testing can really help the project: + +- Testing if a bug is reproducible on your local system +- Testing PRs to ensure that they work correctly + +If you chose to test if someone's bug report is reproducible on your local system, then +feel free to add a comment on the ticket confirming this with the output of `wails doctor`. + +To test PRs, choose a PR to test and check if the PR description has the testing scenarios +listed. If not, please ask the person who opened the PR to provide that list. Once you have +determined a valid test scenario, please report your findings on the PR. + +If you ever need more clarity or help on testing, please ask a question in the [Contributing to Wails](https://github.com/wailsapp/wails/discussions/1520) +discussion or on slack. diff --git a/website/docs/gettingstarted/installation.mdx b/website/docs/gettingstarted/installation.mdx index 3b4cd33cc..7358a3ecd 100644 --- a/website/docs/gettingstarted/installation.mdx +++ b/website/docs/gettingstarted/installation.mdx @@ -20,9 +20,9 @@ Wails has a number of common dependencies that are required before installation: ### Go -Download Go from the [Go Downloads Page](https://golang.org/dl/). +Download Go from the [Go Downloads Page](https://go.dev/doc/install). -Ensure that you follow the official [Go installation instructions](https://golang.org/doc/install.mdx#install). You will also need to ensure that your `PATH` environment variable also includes the path to your `~/go/bin` directory. Restart your terminal and do the following checks: +Ensure that you follow the official [Go installation instructions](https://go.dev/doc/install). You will also need to ensure that your `PATH` environment variable also includes the path to your `~/go/bin` directory. Restart your terminal and do the following checks: - Check Go is installed correctly: `go version` - Check "~/go/bin" is in your PATH variable: `echo $PATH | grep go/bin` @@ -37,6 +37,7 @@ Run `npm --version` to verify. You will also need to install platform specific dependencies: + import Tabs from "@theme/Tabs"; import TabItem from "@theme/TabItem"; @@ -76,3 +77,10 @@ Run `go install github.com/wailsapp/wails/v2/cmd/wails@latest` to install the Wa ## System Check Running `wails doctor` will check if you have the correct dependencies installed. If not, it will advise on what is missing and help on how to rectify any problems. + +## The `wails` command appears to be missing? + +If your system is reporting that the `wails` command is missing, make sure you have followed the Go installation guide +correctly. Normally, it means that the `go/bin` directory in your User's home directory is not in the `PATH` environment +variable. You will also normally need to close and reopen any open command prompts so that changes to the environment +made by the installer are reflected at the command prompt. \ No newline at end of file diff --git a/website/docs/guides/application-development.mdx b/website/docs/guides/application-development.mdx index 039cb227d..d9de25d2e 100644 --- a/website/docs/guides/application-development.mdx +++ b/website/docs/guides/application-development.mdx @@ -113,6 +113,40 @@ func main() { This will bind all public methods in our `App` struct (it will never bind the startup and shutdown methods). +### Dealing with context when binding multiple structs + +If you want to bind methods for multiple structs but want each struct to keep a reference to the context so that you +can use the runtime functions, a good pattern is to pass the context from the `OnStartup` method to your struct instances +: + +```go +func main() { + + app := NewApp() + otherStruct := NewOtherStruct() + + err := wails.Run(&options.App{ + Title: "My App", + Width: 800, + Height: 600, + OnStartup: func(ctx context.Context){ + app.SetContext(ctx) + otherStruct.SetContext(ctx) + }, + OnShutdown: app.shutdown, + Bind: []interface{}{ + app, + otherStruct + }, + }) + if err != nil { + log.Fatal(err) + } +} +``` + + + More information on Binding can be found [here](../howdoesitwork.mdx#method-binding). ## Application Menu diff --git a/website/docs/guides/frontend.mdx b/website/docs/guides/frontend.mdx index 84489cd99..6c9d0cf27 100644 --- a/website/docs/guides/frontend.mdx +++ b/website/docs/guides/frontend.mdx @@ -3,7 +3,7 @@ ## Script Injection -When Wails serves your `index.html`, by default, it will inject 2 script entries into the `` tag to load `/wails/bindings.js` +When Wails serves your `index.html`, by default, it will inject 2 script entries into the `` tag to load `/wails/ipc.js` and `/wails/runtime.js`. These files install the bindings and runtime respectively. The code below shows where these are injected by default: diff --git a/website/docs/guides/troubleshooting.mdx b/website/docs/guides/troubleshooting.mdx index 1ab08d6f3..2bea2216e 100644 --- a/website/docs/guides/troubleshooting.mdx +++ b/website/docs/guides/troubleshooting.mdx @@ -1,8 +1,14 @@ - # Troubleshooting An assortment of troubleshooting tips. +## The `wails` command appears to be missing? + +If your system is reporting that the `wails` command is missing, make sure you have followed the Go installation guide +correctly. Normally, it means that the `go/bin` directory in your User's home directory is not in the `PATH` environment +variable. You will also normally need to close and reopen any open command prompts so that changes to the environment +made by the installer are reflected at the command prompt. + ## My application is displaying a white/blank screen Check that your application includes the assets from the correct directory. In your `main.go` file, you will have @@ -14,6 +20,20 @@ var assets embed.FS ``` Check that `frontend/dist` contains your application assets. +### Mac + +If this happens on Mac, try adding the following to your `Info.plist`: + +```xml +NSAppTransportSecurity + + NSAllowsLocalNetworking + + +``` + +Reference: https://github.com/wailsapp/wails/issues/1504#issuecomment-1174317433 + ## Mac application not valid If your built application looks like this in finder: @@ -22,7 +42,7 @@ If your built application looks like this in finder:

-it's likely that your application's `info.plist` is invalid. Update the file in `build/.app/Contents/info.plist` +it''s likely that your application''s `info.plist` is invalid. Update the file in `build/.app/Contents/info.plist` and check if the data is valid, EG check the binary name is correct. To persist the changes, copy the file back to the `build/darwin` directory. @@ -56,7 +76,7 @@ window.go.main.App.TestFunc(msg, args).then((result) => { //without the 3 dots ``` Credit: https://github.com/wailsapp/wails/issues/1186 -## I'm having getting proxy errors when trying to install Wails +## I''m having getting proxy errors when trying to install Wails If you are getting errors like this: ``` @@ -68,4 +88,10 @@ The solution is to set up the proxy manually, eg: go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.cn,direct ``` -Source: https://github.com/wailsapp/wails/issues/1233 \ No newline at end of file +Source: https://github.com/wailsapp/wails/issues/1233 + +## The generated Typescript doesn''t have the correct types + +Sometimes the generated Typescript doesn''t have the correct types. To mitigate this, +it is possible to specify what types should be generated using the `ts_type` struct tag. For +more details, please read [this](https://github.com/tkrajina/typescriptify-golang-structs#custom-types). \ No newline at end of file diff --git a/website/docs/guides/windows.mdx b/website/docs/guides/windows.mdx index e0ec17d5f..520f0bd86 100644 --- a/website/docs/guides/windows.mdx +++ b/website/docs/guides/windows.mdx @@ -35,3 +35,20 @@ up to the user. ### Error If no suitable runtime is found, an error is given to the user and no further action taken. + +## Fixed version runtime + +Another way of dealing with webview2 dependency is shipping it yourself. +You can download [fixed version runtime](https://developer.microsoft.com/ru-ru/microsoft-edge/webview2/#download-section) and bundle or download it with your application. + +Also, you should specify path to fixed version of webview2 runtime in the `windows.Options` structure when launching wails. + +```go + wails.Run(&options.App{ + Windows: &windows.Options{ + WebviewBrowserPath: "", + }, + }) +``` + +Note: When `WebviewBrowserPath` is specified, `error` strategy will be forced in case of minimal required version mismatch or invalid path to a runtime. \ No newline at end of file diff --git a/website/docs/reference/cli.mdx b/website/docs/reference/cli.mdx index 44ba1f165..54259b809 100644 --- a/website/docs/reference/cli.mdx +++ b/website/docs/reference/cli.mdx @@ -68,8 +68,10 @@ A list of community maintained templates can be found [here](../community/templa | -v int | Verbosity level (0 - silent, 1 - default, 2 - verbose) | 1 | | -webview2 | WebView2 installer strategy: download,embed,browser,error | download | | -u | Updates your project's `go.mod` to use the same version of Wails as the CLI | | -| -debug | Retains debug information in the application | false | +| -debug | Retains debug information in the application. Allows the use of the devtools in the application window | false | | -trimpath | Remove all file system paths from the resulting executable. | false | +| -race | Build with Go's race detector | false | +| -windowsconsole | Keep the console window for Windows builds | false | For a detailed description of the `webview2` flag, please refer to the [Windows](../guides/windows.mdx) Guide. @@ -168,6 +170,7 @@ Your system is ready for Wails development! | -tags "extra tags" | Build tags to pass to compiler (quoted and space separated) | | | -loglevel "loglevel"| Loglevel to use - Trace, Debug, Info, Warning, Error | Debug | | -noreload | Disable automatic reload when assets change | | +| -nogen | Disable generate module | | | -v | Verbosity level (0 - silent, 1 - standard, 2 - verbose) | 1 | | -wailsjsdir | The directory to generate the generated Wails JS modules | Value in `wails.json` | | -debounce | The time to wait for reload after an asset change is detected | 100 (milliseconds) | @@ -175,8 +178,8 @@ Your system is ready for Wails development! | -frontenddevserverurl "url" | Use 3rd party dev server url to serve assets, EG Vite | "" | | -appargs "args" | Arguments passed to the application in shell style | | | -platform "platform" | Platform/Arch to target | `runtime.GOOS` | -| -save | Saves the given `assetdir`, `reloaddirs`, `wailsjsdir`, `debounce`, `devserver` and `frontenddevserverurl` flags in - `wails.json` to become the defaults for subsequent invocations. | | +| -save | Saves the given `assetdir`, `reloaddirs`, `wailsjsdir`, `debounce`, `devserver` and `frontenddevserverurl` flags in `wails.json` to become the defaults for subsequent invocations. | | +| -race | Build with Go's race detector | false | Example: @@ -217,4 +220,4 @@ For more details on creating templates, consult the [Templates guide](../guides/ ## version -`wails version` will simply output the current CLI version. \ No newline at end of file +`wails version` will simply output the current CLI version. diff --git a/website/docs/reference/menus.mdx b/website/docs/reference/menus.mdx index bab623586..ac083ef51 100644 --- a/website/docs/reference/menus.mdx +++ b/website/docs/reference/menus.mdx @@ -18,6 +18,10 @@ An example of how to create a menu: FileMenu.AddText("Quit", keys.CmdOrCtrl("q"), func(_ *menu.CallbackData) { runtime.Quit() }) + + if runtime.GOOS == "darwin" { + AppMenu.Append(menu.EditMenu()) // on macos platform, we should append EditMenu to enable Cmd+C,Cmd+V,Cmd+Z... shortcut + } err := wails.Run(&options.App{ Title: "Menus Demo", diff --git a/website/docs/reference/options.mdx b/website/docs/reference/options.mdx index eb3177633..c557ef612 100644 --- a/website/docs/reference/options.mdx +++ b/website/docs/reference/options.mdx @@ -27,7 +27,7 @@ func main() { MaxHeight: 1024, StartHidden: false, HideWindowOnClose: false, - RGBA: &options.RGBA{R: 0, G: 0, B: 0, A: 255}, + BackgroundColour: &options.RGBA{R: 0, G: 0, B: 0, A: 255}, AlwaysOnTop: false, Assets: assets, AssetsHandler: assetsHandler, @@ -48,6 +48,7 @@ func main() { DisableWindowIcon: false, DisableFramelessWindowDecorations: false, WebviewUserDataPath: "", + WebviewBrowserPath: "", Theme: windows.SystemDefault, CustomTheme: &windows.ThemeSettings{ DarkModeTitleBar: windows.RGB(20, 20, 20), @@ -196,14 +197,14 @@ Type: bool By default, closing the window will close the application. Setting this to `true` means closing the window will hide the window instead. -### RGBA +### BackgroundColour -Name: RGBA +Name: BackgroundColour Type: int (0xRRGGBBAA) Example: 0xFF000088 - Red at 50% transparency -This value is the RGBA value to set the window by default. +This value is the default background colour of the window. Default: 0xFFFFFFFF. ### AlwaysOnTop @@ -392,7 +393,7 @@ Name: WebviewIsTransparent Type: bool Setting this to `true` will make the webview background transparent when an alpha value of `0` is used. -This means that if you use `rgba(0,0,0,0)`, the host window will show through. +This means that if you use `rgba(0,0,0,0)` for `background-color` in your CSS, the host window will show through. Often combined with [WindowIsTranslucent](#WindowIsTranslucent) to make frosty-looking applications. ### WindowIsTranslucent @@ -430,6 +431,19 @@ Type: string This defines the path where the WebView2 stores the user data. If empty `%APPDATA%\[BinaryName.exe]` will be used. +### WebviewBrowserPath + +Name: WebviewBrowserPath + +Type: string + +This defines the path to a directory with WebView2 executable files and libraries. If empty, webview2 installed in the system will be used. + +Important information about distribution of fixed version runtime: +- [How to get and extract runtime](https://docs.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#details-about-the-fixed-version-runtime-distribution-mode) +- [Known issues for fixed version](https://docs.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#known-issues-for-fixed-version) +- [The path of fixed version of the WebView2 Runtime should not contain \Edge\Application\.](https://docs.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/webview2-idl?view=webview2-1.0.1245.22#createcorewebview2environmentwithoptions) + ### Theme Name: Theme @@ -511,6 +525,33 @@ Type: `*windows.Messages` A struct of strings used by the webview2 installer if a valid webview2 runtime is not found. Customise this for any language you choose to support. +### ResizeDebounceMS + +Name: ResizeDebounceMS + +Type: uint16 + +ResizeDebounceMS is the amount of time to debounce redraws of webview2 when resizing the window. +The default value (0) will perform redraws as fast as it can. + +### OnSuspend + +Name: OnSuspend + +Type: func() + +If set, this function will be called when windows initiates a switch to low power mode (suspend/hibernate) + +### OnResume + +Name: OnResume + +Type: func() + +If set, this function will be called when windows resumes from low power mode (suspend/hibernate) + + + ## Mac Specific Options ### TitleBar @@ -536,7 +577,7 @@ Name: WebviewIsTransparent Type: bool Setting this to `true` will make the webview background transparent when an alpha value of `0` is used. -This means that if you use `rgba(0,0,0,0)`, the host window will show through. +This means that if you use `rgba(0,0,0,0)` for `background-color` in your CSS, the host window will show through. Often combined with [WindowIsTranslucent](#WindowIsTranslucent) to make frosty-looking applications. ### WindowIsTranslucent diff --git a/website/docs/reference/project-config.mdx b/website/docs/reference/project-config.mdx index 178504a63..de612d5f7 100644 --- a/website/docs/reference/project-config.mdx +++ b/website/docs/reference/project-config.mdx @@ -19,7 +19,7 @@ The project config resides in the `wails.json` file in the project directory. Th "wailsjsdir": "[Relative path to the directory that the auto-generated JS modules will be created]", "version": "[Project config version]", "outputfilename": "[The name of the binary]", - "debounceMS": 100, // The default time the dev server waits to reload when it detects a vhange in assets + "debounceMS": 100, // The default time the dev server waits to reload when it detects a change in assets "devServer": "[Address to bind the wails dev sever to. Default: localhost:34115]", "appargs": "[Arguments passed to the application in shell style when in dev mode]", "runNonNativeBuildHooks": false, // Defines if build hooks should be run though they are defined for an OS other than the host OS. @@ -35,7 +35,7 @@ The project config resides in the `wails.json` file in the project directory. Th "copyright": "[The copyright of the product. Default: 'Copyright.........']", "comments": "[A short comment of the app. Default: 'Built using Wails (https://wails.app)']" }, - "nsisType": "['multiple': One installer per achitecture. 'single': Single universal installer for all architectures being built. Default: 'multiple']" + "nsisType": "['multiple': One installer per architecture. 'single': Single universal installer for all architectures being built. Default: 'multiple']" } ``` diff --git a/website/docs/reference/runtime/intro.mdx b/website/docs/reference/runtime/intro.mdx index b3616f689..583c84791 100644 --- a/website/docs/reference/runtime/intro.mdx +++ b/website/docs/reference/runtime/intro.mdx @@ -32,7 +32,7 @@ Quits the application. ### Environment -Go Signature: `Enviromnent(ctx context.Context) EnvironmentInfo` +Go Signature: `Environment(ctx context.Context) EnvironmentInfo` Returns details of the current environment. diff --git a/website/docs/reference/runtime/window.mdx b/website/docs/reference/runtime/window.mdx index 915ca9ac4..baf6222e5 100644 --- a/website/docs/reference/runtime/window.mdx +++ b/website/docs/reference/runtime/window.mdx @@ -127,6 +127,14 @@ Will resize the window if the window is currently larger than the given dimensio Setting a size of `0,0` will disable this constraint. +### WindowSetAlwaysOnTop +Go Signature: `WindowSetAlwaysOnTop(ctx context.Context, b bool)` + +JS Signature: `WindowSetAlwaysOnTop(b: Boolen)` + +Sets the window AlwaysOnTop or not on top. + + ### WindowSetPosition Go Signature: `WindowSetPosition(ctx context.Context, x int, y int)` @@ -176,10 +184,10 @@ JS Signature: `WindowUnminimise()` Restores the window to the dimensions and position prior to minimising. -### WindowSetRGBA -Go Signature: `WindowSetRGBA(ctx context.Context, R, G, B, A uint8)` +### WindowSetBackgroundColour +Go Signature: `WindowSetBackgroundColour(ctx context.Context, R, G, B, A uint8)` -JS Signature: `WindowSetRGBA(R, G, B, A)` +JS Signature: `WindowSetBackgroundColour(R, G, B, A)` Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. diff --git a/website/i18n/en/code.json b/website/i18n/en/code.json index 4827318b8..8c25f6120 100644 --- a/website/i18n/en/code.json +++ b/website/i18n/en/code.json @@ -18,7 +18,7 @@ "message": "Quickly generate, build and package your projects using the Wails CLI." }, "homepage.Tagline": { - "message": "Build beautiful cross-platform applications using Go + HTML + CSS + JS" + "message": "Build beautiful cross-platform applications using Go" }, "homepage.ButtonText": { "message": "Get Started" diff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/templates.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/templates.mdx index dfdc392b9..32a39ac2f 100644 --- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/templates.mdx +++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/templates.mdx @@ -35,7 +35,7 @@ sidebar_position: 1 - [wails-react-template](https://github.com/AlienRecall/wails-react-template) - 基于 reactjs 的模板 - [wails-react-template](https://github.com/flin7/wails-react-template) - 基于 React 并支持实时开发模式的轻量级模板 - [wails-vite-react-ts](https://github.com/lontten/wails-vite-react-ts) - 基于 Vite + React + TypeScript 的模板 - +- [wails-template-nextjs](https://github.com/LGiki/wails-template-nextjs) - 基于 Next.js + TypeScript 的模板 ## Svelte diff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/frontend.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/frontend.mdx index af76b5d2c..1cb7ba724 100644 --- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/frontend.mdx +++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/frontend.mdx @@ -2,7 +2,7 @@ ## 脚本注入 -当 Wails 为您的`index.html`提供服务时，默认情况下，它会将 2 个脚本注入``标签以加载`/wails/bindings.js`和`/wails/runtime.js`。 这些文件分别安装绑定和运行时。 +当 Wails 为您的`index.html`提供服务时，默认情况下，它会将 2 个脚本注入``标签以加载`/wails/ipc.js`和`/wails/runtime.js`。 这些文件分别安装绑定和运行时。 下面的代码显示了这些默认注入的位置： diff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/runtime/intro.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/runtime/intro.mdx index 18de6ed93..08abbef9f 100644 --- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/runtime/intro.mdx +++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/runtime/intro.mdx @@ -25,7 +25,7 @@ Go 方法签名: `Quit(ctx context.Context)` ### 环境 -Go 方法签名: `Enviromnent(ctx context.Context) EnvironmentInfo` +Go 方法签名: `Environment(ctx context.Context) EnvironmentInfo` 返回当前环境的详细信息。 diff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/community/templates.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/community/templates.mdx index e922abf4a..32a39ac2f 100644 --- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/community/templates.mdx +++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/community/templates.mdx @@ -35,6 +35,7 @@ sidebar_position: 1 - [wails-react-template](https://github.com/AlienRecall/wails-react-template) - 基于 reactjs 的模板 - [wails-react-template](https://github.com/flin7/wails-react-template) - 基于 React 并支持实时开发模式的轻量级模板 - [wails-vite-react-ts](https://github.com/lontten/wails-vite-react-ts) - 基于 Vite + React + TypeScript 的模板 +- [wails-template-nextjs](https://github.com/LGiki/wails-template-nextjs) - 基于 Next.js + TypeScript 的模板 ## Svelte diff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/guides/frontend.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/guides/frontend.mdx index af76b5d2c..1cb7ba724 100644 --- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/guides/frontend.mdx +++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/guides/frontend.mdx @@ -2,7 +2,7 @@ ## 脚本注入 -当 Wails 为您的`index.html`提供服务时，默认情况下，它会将 2 个脚本注入``标签以加载`/wails/bindings.js`和`/wails/runtime.js`。 这些文件分别安装绑定和运行时。 +当 Wails 为您的`index.html`提供服务时，默认情况下，它会将 2 个脚本注入``标签以加载`/wails/ipc.js`和`/wails/runtime.js`。 这些文件分别安装绑定和运行时。 下面的代码显示了这些默认注入的位置： diff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/reference/runtime/intro.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/reference/runtime/intro.mdx index 18de6ed93..08abbef9f 100644 --- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/reference/runtime/intro.mdx +++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/version-v2.0.0-beta.34/reference/runtime/intro.mdx @@ -25,7 +25,7 @@ Go 方法签名: `Quit(ctx context.Context)` ### 环境 -Go 方法签名: `Enviromnent(ctx context.Context) EnvironmentInfo` +Go 方法签名: `Environment(ctx context.Context) EnvironmentInfo` 返回当前环境的详细信息。 diff --git a/website/i18n/zh-Hans/docusaurus-plugin-content-pages/credits.mdx b/website/i18n/zh-Hans/docusaurus-plugin-content-pages/credits.mdx index f8255f21f..d5e6d2041 100644 --- a/website/i18n/zh-Hans/docusaurus-plugin-content-pages/credits.mdx +++ b/website/i18n/zh-Hans/docusaurus-plugin-content-pages/credits.mdx @@ -8,13 +8,13 @@ ## 赞助商
- - + +

@@ -65,9 +65,6 @@ - - - @@ -101,15 +98,26 @@ - - + + + + + + + + `, - }} + }} /> ## 贡献者 + + + + + import Contributors from "@wails/react-contributors"; diff --git a/website/src/css/custom.css b/website/src/css/custom.css index cdfd09294..619d79f5c 100644 --- a/website/src/css/custom.css +++ b/website/src/css/custom.css @@ -39,7 +39,7 @@ html[data-theme="dark"] .docusaurus-highlight-code-line { --ifm-color-primary-lightest: rgb(146, 224, 208); --ifm-code-font-size: 95%; --ifm-button-color: white; - --ifm-container-width-xl: 85%; + --ifm-container-width-xl: 100%; } .docusaurus-highlight-code-line { @@ -53,6 +53,10 @@ html[data-theme="dark"] .docusaurus-highlight-code-line { counter-reset: line-number; } +.container { + padding-left: 2%; +} + .prism-code.language-js .token-line::before, .prism-code.language-ts .token-line::before, .prism-code.language-go .token-line::before { diff --git a/website/src/pages/changelog.md b/website/src/pages/changelog.md index 086a7427e..99be4d38d 100644 --- a/website/src/pages/changelog.md +++ b/website/src/pages/changelog.md @@ -7,6 +7,102 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v2.0.0-beta.38] - 2022-06-27 + +### Added + +* Add race detector to build & dev by @Lyimmi in https://github.com/wailsapp/wails/pull/1426 +* [linux] Support `linux/arm` architecture by @Lyimmi in https://github.com/wailsapp/wails/pull/1427 +* Create gitignore when using `-g` option by @jaesung9507 in https://github.com/wailsapp/wails/pull/1430 +* [windows] Add Suspend/Resume callback support by @leaanthony in https://github.com/wailsapp/wails/pull/1474 +* Add runtime function `WindowSetAlwaysOnTop` by @chenxiao1990 in https://github.com/wailsapp/wails/pull/1442 +* [windows] Allow setting browser path by @NanoNik in https://github.com/wailsapp/wails/pull/1448 + +### Fixed + +* [linux] Improve switching to main thread for callbacks by @stffabi in https://github.com/wailsapp/wails/pull/1392 +* [windows] Fix WebView2 minimum runtime version check by @stffabi in https://github.com/wailsapp/wails/pull/1456 +* [linux] Fix apt command syntax (#1458) by @abtin in https://github.com/wailsapp/wails/pull/1461 +* [windows] Set Window Background colour if provided + debounce redraw option by @leaanthony + in https://github.com/wailsapp/wails/pull/1466 +* Fix small typo in docs by @LukenSkyne in https://github.com/wailsapp/wails/pull/1449 +* Fix the url to surge by @andywenk in https://github.com/wailsapp/wails/pull/1460 +* Fixed theme change at runtime by @leaanthony in https://github.com/wailsapp/wails/pull/1473 +* Fix: Don't stop if unable to remove temporary bindings build by @leaanthony + in https://github.com/wailsapp/wails/pull/1465 +* [windows] Pass the correct installationStatus to the webview installation strategy by @stffabi + in https://github.com/wailsapp/wails/pull/1483 +* [windows] Make `SetBackgroundColour` compatible for `windows/386` by @stffabi + in https://github.com/wailsapp/wails/pull/1493 +* Fix lit-ts template by @Orijhins in https://github.com/wailsapp/wails/pull/1494 + +### Changed + +* [windows] Load WebView2 loader from embedded only by @stffabi in https://github.com/wailsapp/wails/pull/1432 +* Add showcase entry for October + update homepage carousel entry for October by @marcus-crane + in https://github.com/wailsapp/wails/pull/1436 +* Always use return in wrapped method by @leaanthony in https://github.com/wailsapp/wails/pull/1410 +* [windows] Unlock OSThread after native calls have been finished by @stffabi + in https://github.com/wailsapp/wails/pull/1441 +* Add `BackgroundColour` and deprecate `RGBA` by @leaanthony in https://github.com/wailsapp/wails/pull/1475 +* AssetsHandler remove retry logic in dev mode by @stffabi in https://github.com/wailsapp/wails/pull/1479 +* Add Solid JS template to docs by @sidwebworks in https://github.com/wailsapp/wails/pull/1492 +* Better signal handling by @leaanthony in https://github.com/wailsapp/wails/pull/1488 +* Chore/react 18 create root by @tomanagle in https://github.com/wailsapp/wails/pull/1489 + +## New Contributors + +* @jaesung9507 made their first contribution in https://github.com/wailsapp/wails/pull/1430 +* @LukenSkyne made their first contribution in https://github.com/wailsapp/wails/pull/1449 +* @andywenk made their first contribution in https://github.com/wailsapp/wails/pull/1460 +* @abtin made their first contribution in https://github.com/wailsapp/wails/pull/1461 +* @chenxiao1990 made their first contribution in https://github.com/wailsapp/wails/pull/1442 +* @NanoNik made their first contribution in https://github.com/wailsapp/wails/pull/1448 +* @sidwebworks made their first contribution in https://github.com/wailsapp/wails/pull/1492 +* @tomanagle made their first contribution in https://github.com/wailsapp/wails/pull/1489 + +## [v2.0.0-beta.37] - 2022-05-26 + +### Added + +* Add `nogen` flag in wails dev command by @mondy in https://github.com/wailsapp/wails/pull/1413 +* Initial support for new native translucency in Windows Preview by @leaanthony + in https://github.com/wailsapp/wails/pull/1400 + +### Fixed + +* Bugfix/incorrect bindings by @leaanthony in https://github.com/wailsapp/wails/pull/1383 +* Fix runtime.js events by @polikow in https://github.com/wailsapp/wails/pull/1369 +* Fix docs formatting by @antimatter96 in https://github.com/wailsapp/wails/pull/1372 +* Events | fixes #1388 by @lambdajack in https://github.com/wailsapp/wails/pull/1390 +* bugfix: correct typo by @tmclane in https://github.com/wailsapp/wails/pull/1391 +* Fix typo in docs by @LGiki in https://github.com/wailsapp/wails/pull/1393 +* Fix typo bindings.js to ipc.js by @rayshoo in https://github.com/wailsapp/wails/pull/1406 +* Make sure to execute the menu callbacks on a new goroutine by @stffabi in https://github.com/wailsapp/wails/pull/1403 +* Update runtime.d.ts & templates by @Yz4230 in https://github.com/wailsapp/wails/pull/1421 +* Add missing className to input in React and Preact templates by @edwardbrowncross in https://github.com/wailsapp/wails/pull/1419 + +### Changed +* Improve multi-platform builds by @stffabi in https://github.com/wailsapp/wails/pull/1373 +* During wails dev only use reload logic if no AssetsHandler are in use by @stffabi in https://github.com/wailsapp/wails/pull/1385 +* Update events.mdx by @Junkher in https://github.com/wailsapp/wails/pull/1387 +* Add Next.js template by @LGiki in https://github.com/wailsapp/wails/pull/1394 +* Add docs on wails generate module by @TechplexEngineer in https://github.com/wailsapp/wails/pull/1414 +* Add macos custom menu EditMenu tips by @daodao97 in https://github.com/wailsapp/wails/pull/1423 + +### New Contributors +* @polikow made their first contribution in https://github.com/wailsapp/wails/pull/1369 +* @antimatter96 made their first contribution in https://github.com/wailsapp/wails/pull/1372 +* @Junkher made their first contribution in https://github.com/wailsapp/wails/pull/1387 +* @lambdajack made their first contribution in https://github.com/wailsapp/wails/pull/1390 +* @LGiki made their first contribution in https://github.com/wailsapp/wails/pull/1393 +* @rayshoo made their first contribution in https://github.com/wailsapp/wails/pull/1406 +* @TechplexEngineer made their first contribution in https://github.com/wailsapp/wails/pull/1414 +* @mondy made their first contribution in https://github.com/wailsapp/wails/pull/1413 +* @Yz4230 made their first contribution in https://github.com/wailsapp/wails/pull/1421 +* @daodao97 made their first contribution in https://github.com/wailsapp/wails/pull/1423 +* @edwardbrowncross made their first contribution in https://github.com/wailsapp/wails/pull/1419 + ## [v2.0.0-beta.36] - 2022-04-27 diff --git a/website/src/pages/credits.mdx b/website/src/pages/credits.mdx index 21abd50e6..61b88d3dc 100644 --- a/website/src/pages/credits.mdx +++ b/website/src/pages/credits.mdx @@ -8,13 +8,13 @@ ## Sponsors
- - + +

@@ -65,9 +65,6 @@ - - - @@ -101,15 +98,26 @@ - - + + + + + + + + `, - }} + }} /> ## Contributors + + + + + import Contributors from "@wails/react-contributors"; diff --git a/website/static/img/october.png b/website/static/img/october.png index ba5052bee..b25c1dc92 100644 Binary files a/website/static/img/october.png and b/website/static/img/october.png differ diff --git a/website/static/img/showcase/october.png b/website/static/img/showcase/october.png new file mode 100644 index 000000000..7dfbccdf6 Binary files /dev/null and b/website/static/img/showcase/october.png differ diff --git a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/firstproject.mdx b/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/firstproject.mdx deleted file mode 100644 index 8d4c8d946..000000000 --- a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/firstproject.mdx +++ /dev/null @@ -1,54 +0,0 @@ ---- -sidebar_position: 2 ---- - -# Creating a Project - -## Project Generation - -Now that the CLI is installed, you can generate a new project by using the `wails init` command. - -To get up and running quickly, you can generate a default project by running `wails init -n myproject`. This will -create a directory called `myproject` and populate it with the default template. - -Other project templates are available and can be listed using `wails init -l`. -There are also [community templates](../community/templates) available that offer different capabilities and frameworks. - -To see the other options available, you can run `wails init -help`. -More details can be found in the [CLI Reference](../reference/cli#init). - -## Project Layout - -Wails projects have the following layout: - -``` -. -├── build/ -│ ├── appicon.png -│ ├── darwin/ -│ └── windows/ -├── frontend/ -├── go.mod -├── go.sum -├── main.go -└── wails.json -``` - -### Project structure rundown - -- `/main.go` - The main application -- `/frontend/` - Frontend project files -- `/build/` - Project build directory - - `/build/appicon.png` - The application icon - - `/build/darwin/` - Mac specific project files - - `/build/windows/` - Windows specific project files -- `/wails.json` - The project configuration -- `/go.mod` - Go module file -- `/go.sum` - Go module checksum file - -The `frontend` directory has nothing specific to Wails and can be any frontend project of your choosing. - -The `build` directory is used during the build process. These files may be updated to customise your builds. If -files are removed from the build directory, default versions will be regenerated. - -The default module name in `go.mod` is "changeme". You should change this to something more appropriate. diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/developing-wails.mdx b/website/versioned_docs/version-v2.0.0-beta.34/guides/developing-wails.mdx deleted file mode 100644 index 58f9e9bd8..000000000 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/developing-wails.mdx +++ /dev/null @@ -1,39 +0,0 @@ - -# Contributing - -This page is a guide on how to contribute to the Wails project. - -First, a word of warning: Wails v2 has been through a number of iterations and pivots. There is a lot of code that -is either on hold or deprecated. Reading the whole project and trying to understand it may be confusing. This document -aims to focus on what is current and how to understand that. - -## Bugs - -For raising bugs, please open a ticket on GitHub and give it the \[v2\] label. Include the output of `wails doctor` -in the ticket to help us understand your environment. - -For fixing bugs, please comment on a ticket that you'd like to take it on and we will put a label on the ticket. -It is best to use Windows as it is done in pure Go, making debugging much easier. - -## Features - -To request a new feature, raise a ticket so that it may be discussed. The ticket should be given the -"Feature Request" label. These will be discussed and if selected for development will be given the label -"Ready for Development". - -To implement a new feature, raise a ticket as above or select a ticket with the "Ready for Development" label. - -When raising a PR, be mindful to state what platforms the PR has been tested on. Any new feature will not be accepted unless it works -on all platforms (if it can). - -:::warning What not to do - -PRs for features with no tickets aren't helpful as there's no context to the PR and it will not be prioritised. - -::: - -## Documentation - -Contributing to the documentation is easy by clicking on the "Edit this page" link on any of the pages. Documentation -updates can be done ad-hoc, without a ticket. - diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/surge.mdx b/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/surge.mdx deleted file mode 100644 index bccc51c82..000000000 --- a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/surge.mdx +++ /dev/null @@ -1,8 +0,0 @@ -# Surge - -

-
-

- -[Surge](https://surge.rule110.io/) is a p2p filesharing app designed to utilize blockchain technologies to enable 100% anonymous file transfers. Surge is end-to-end encrypted, decentralized and open source. - diff --git a/website/versioned_docs/version-v2.0.0-beta.34/appendix/_category_.json b/website/versioned_docs/version-v2.0.0-beta.37/appendix/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/appendix/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.37/appendix/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/_category_.json b/website/versioned_docs/version-v2.0.0-beta.37/community/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.37/community/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/links.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/links.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/links.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/links.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/_category_.json b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/encrypteasy.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/encrypteasy.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/encrypteasy.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/encrypteasy.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/filehound.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/filehound.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/filehound.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/filehound.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/mollywallet.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/mollywallet.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/mollywallet.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/mollywallet.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/optimus.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/optimus.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/optimus.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/optimus.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/portfall.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/portfall.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/portfall.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/portfall.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/riftshare.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/riftshare.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/riftshare.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/riftshare.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/surge.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/surge.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/surge.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/surge.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/wally.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/wally.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/wally.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/wally.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/wombat.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/wombat.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/wombat.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/wombat.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/showcase/ytd.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/showcase/ytd.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/community/showcase/ytd.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/showcase/ytd.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/community/templates.mdx b/website/versioned_docs/version-v2.0.0-beta.37/community/templates.mdx similarity index 81% rename from website/versioned_docs/version-v2.0.0-beta.34/community/templates.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/community/templates.mdx index 4dee08cd1..2ed94f04e 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/community/templates.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/community/templates.mdx @@ -5,7 +5,7 @@ sidebar_position: 1 # Templates This page serves as a list for community supported templates. Please submit a PR (click `Edit this page` at the bottom) -to include your templates. To build your own template, please see the [Templates](../guides/templates) guide. +to include your templates. To build your own template, please see the [Templates](../guides/templates.mdx) guide. To use these templates, run `wails init -n "Your Project Name" -t [the link below[@version]]` @@ -35,10 +35,17 @@ If you are unsure about a template, inspect `package.json` and `wails.json` for - [wails-react-template](https://github.com/AlienRecall/wails-react-template) - A template using reactjs - [wails-react-template](https://github.com/flin7/wails-react-template) - A minimal template for React that supports live development -- [wails-vite-react-ts](https://github.com/lontten/wails-vite-react-ts) - A template with Vite + React + TypeScript +- [wails-template-nextjs](https://github.com/LGiki/wails-template-nextjs) - A template using Next.js and TypeScript + +# Solid +- [wails-solid-template](https://github.com/sidwebworks/wails-solid-template) - A template using Solid JS ## Svelte - [wails-svelte-template](https://github.com/raitonoberu/wails-svelte-template) - A template using Svelte - [wails-vite-svelte-template](https://github.com/BillBuilt/wails-vite-svelte-template) - A template using Svelte and Vite - [wails-vite-svelte-tailwind-template](https://github.com/BillBuilt/wails-vite-svelte-tailwind-template) - A template using Svelte and Vite with TailwindCSS v3 + +## Elm + +- [wails-elm-template](https://github.com/benjamin-thomas/wails-elm-template) - Develop your GUI app with functional programming and a **snappy** hot-reload setup :tada: :rocket: diff --git a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/_category_.json b/website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/building.mdx b/website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/building.mdx similarity index 92% rename from website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/building.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/building.mdx index 6709a026a..8c6957117 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/building.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/building.mdx @@ -15,5 +15,5 @@ If you run the binary, you should see the default application:
-For more details on compilation options, please refer to the [CLI Reference](../reference/cli#build). +For more details on compilation options, please refer to the [CLI Reference](../reference/cli.mdx#build). diff --git a/website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/development.mdx b/website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/development.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/development.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/development.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/firstproject.mdx b/website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/firstproject.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/firstproject.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/firstproject.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/installation.mdx b/website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/installation.mdx similarity index 92% rename from website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/installation.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/installation.mdx index a48364ce4..3b4cd33cc 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/installation.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/gettingstarted/installation.mdx @@ -22,7 +22,7 @@ Wails has a number of common dependencies that are required before installation: Download Go from the [Go Downloads Page](https://golang.org/dl/). -Ensure that you follow the official [Go installation instructions](https://golang.org/doc/install#install). You will also need to ensure that your `PATH` environment variable also includes the path to your `~/go/bin` directory. Restart your terminal and do the following checks: +Ensure that you follow the official [Go installation instructions](https://golang.org/doc/install.mdx#install). You will also need to ensure that your `PATH` environment variable also includes the path to your `~/go/bin` directory. Restart your terminal and do the following checks: - Check Go is installed correctly: `go version` - Check "~/go/bin" is in your PATH variable: `echo $PATH | grep go/bin` diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/_category_.json b/website/versioned_docs/version-v2.0.0-beta.37/guides/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.37/guides/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/application-development.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/application-development.mdx similarity index 89% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/application-development.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/application-development.mdx index 639cc089c..039cb227d 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/application-development.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/guides/application-development.mdx @@ -30,7 +30,7 @@ func (a *App) shutdown(ctx context.Context) { - The startup method is called as soon as Wails allocates the resources it needs and is a good place for creating resources, setting up event listeners and anything else the application needs at startup. It is given a `context.Context` which is usually saved in a struct field. This context is needed for calling the - [runtime](../reference/runtime/intro). If this method returns an error, the application will terminate. + [runtime](../reference/runtime/intro.mdx). If this method returns an error, the application will terminate. In dev mode, the error will be output to the console. - The shutdown method will be called by Wails right at the end of the shutdown process. This is a good place to deallocate @@ -59,7 +59,7 @@ func main() { ``` -More information on application lifecycle hooks can be found [here](../howdoesitwork#application-lifecycle-callbacks). +More information on application lifecycle hooks can be found [here](../howdoesitwork.mdx#application-lifecycle-callbacks). ## Binding Methods @@ -113,7 +113,7 @@ func main() { This will bind all public methods in our `App` struct (it will never bind the startup and shutdown methods). -More information on Binding can be found [here](../howdoesitwork#method-binding). +More information on Binding can be found [here](../howdoesitwork.mdx#method-binding). ## Application Menu @@ -161,6 +161,15 @@ The second, if given, will be executed in the `frontend` directory to build the If these 2 keys aren't given, then Wails does absolutely nothing with the frontend. It is only expecting that `embed.FS`. +### AssetsHandler + +A Wails v2 app can optionally define a `http.Handler` in the `options.App`, which allows hooking into the AssetServer to +create files on the fly or process POST/PUT requests. +GET requests are always first handled by the `assets` FS. If the FS doesn't find the requested file the request will be +forwarded to the `http.Handler` for serving. Any requests other than GET will be directly processed by the `AssetsHandler` +if specified. +It's also possible to only use the `AssetsHandler` by specifiy `nil` as the `Assets` option. + ## Built in Dev Server Running `wails dev` will start the built in dev server which will start a file watcher in your project directory. By diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/bleeding-edge.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/bleeding-edge.mdx similarity index 74% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/bleeding-edge.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/bleeding-edge.mdx index 65a486918..292b9d523 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/bleeding-edge.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/guides/bleeding-edge.mdx @@ -35,7 +35,20 @@ To revert back to a stable version, run: If you want to test a branch, follow the instructions above, but ensure you switch the branch you want to test before installing: - `git clone https://github.com/wailsapp/wails` +- `cd wails` - `git checkout -b branch-to-test --track origin/branch-to-test` -- `cd wails/v2/cmd/wails` +- `cd v2/cmd/wails` - `go install` +## Testing a PR + +If you want to test a PR, follow the instructions above, but ensure you fetch the PR and switch the branch before installing. +Please replace `[IDofThePR]` with the ID of the PR shown on github.com: + +- `git clone https://github.com/wailsapp/wails` +- `cd wails` +- `git fetch -u origin pull/[IDofThePR]/head:test/pr-[IDofThePR]` +- `git checkout test/pr-[IDofThePR]` +- `git reset --hard HEAD` +- `cd v2/cmd/wails` +- `go install` diff --git a/website/docs/guides/developing-wails.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/developing-wails.mdx similarity index 100% rename from website/docs/guides/developing-wails.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/developing-wails.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/frameless.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/frameless.mdx similarity index 88% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/frameless.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/frameless.mdx index 9a2adc12a..cd78d3937 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/frameless.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/guides/frameless.mdx @@ -1,8 +1,8 @@ # Frameless Applications -Wails supports applications with no frame. This can be achieved by using the [frameless](../reference/options#frameless) -field in [Application Options](../reference/options#application-options). +Wails supports applications with no frame. This can be achieved by using the [frameless](../reference/options.mdx#frameless) +field in [Application Options](../reference/options.mdx#application-options). Wails offers a simple solution for dragging the window: Any HTML element that has the attribute "data-wails-drag" will act as a "drag handle". This property applies to all nested elements. If you need to indicate that a nested element diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/frontend.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/frontend.mdx similarity index 97% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/frontend.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/frontend.mdx index 84489cd99..6c9d0cf27 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/frontend.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/guides/frontend.mdx @@ -3,7 +3,7 @@ ## Script Injection -When Wails serves your `index.html`, by default, it will inject 2 script entries into the `` tag to load `/wails/bindings.js` +When Wails serves your `index.html`, by default, it will inject 2 script entries into the `` tag to load `/wails/ipc.js` and `/wails/runtime.js`. These files install the bindings and runtime respectively. The code below shows where these are injected by default: diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/ides.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/ides.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/ides.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/ides.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/linux-distro-support.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/linux-distro-support.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/linux-distro-support.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/linux-distro-support.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/manual-builds.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/manual-builds.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/manual-builds.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/manual-builds.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/migrating.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/migrating.mdx similarity index 89% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/migrating.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/migrating.mdx index 9c3d92933..1474131f8 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/migrating.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/guides/migrating.mdx @@ -25,7 +25,7 @@ Example: app.Run() ``` -In v2, there is just a single method, `wails.Run()`, that accepts [application options](../reference/options#application-options). +In v2, there is just a single method, `wails.Run()`, that accepts [application options](../reference/options.mdx#application-options). ```go title="v2" err := wails.Run(&options.App{ @@ -43,7 +43,7 @@ In v2, there is just a single method, `wails.Run()`, that accepts [application o In v1, it was possible to bind both arbitrary functions and structs. In v2, this has been simplified to only binding structs. The struct instances that were previously passed to the `Bind()` method in v1, are now specified in the `Bind` field of -the [application options](../reference/options#application-options): +the [application options](../reference/options.mdx#application-options): ```go title="v1" app := wails.CreateApp(/* options */) @@ -64,13 +64,13 @@ In v1, bound methods were available to the frontend at `window.backend`. This ha ### Application Lifecycle In v1, there were 2 special methods in a bound struct: `WailsInit()` and `WailsShutdown()`. These have -been replaced with 3 lifecycle hooks as part of the [application options](../reference/options#application-options): +been replaced with 3 lifecycle hooks as part of the [application options](../reference/options.mdx#application-options): -- [OnStartup](../reference/options#onstartup) -- [OnShutdown](../reference/options#onshutdown) -- [OnDomReady](../reference/options#ondomready) +- [OnStartup](../reference/options.mdx#onstartup) +- [OnShutdown](../reference/options.mdx#onshutdown) +- [OnDomReady](../reference/options.mdx#ondomready) -Note: [OnDomReady](../reference/options#ondomready) replaces the `wails:ready` system event in v1. +Note: [OnDomReady](../reference/options.mdx#ondomready) replaces the `wails:ready` system event in v1. These methods can be standard functions, but a common practice is to have them part of a struct: @@ -96,11 +96,11 @@ func (b *Basic) startup(ctx context.Context) { The runtime in v2 is much richer than v1 with support for menus, window manipulation and better dialogs. The signature of the methods has changed slightly - please refer -the the [Runtime Reference](../reference/runtime/intro). +the the [Runtime Reference](../reference/runtime/intro.mdx). -In v1, the [runtime](../reference/runtime/intro) was available via a struct passed to `WailsInit()`. +In v1, the [runtime](../reference/runtime/intro.mdx) was available via a struct passed to `WailsInit()`. In v2, the runtime has been moved out to its own package. Each method in the runtime takes the -`context.Context` that is passed to the [OnStartup](../reference/options#onstartup) method. +`context.Context` that is passed to the [OnStartup](../reference/options.mdx#onstartup) method. ```go title="Runtime Example" package main @@ -173,7 +173,7 @@ func main() { Of course, bundlers can be used if you wish to. The only requirement is to pass the final application assets directory to Wails using an `embed.FS` in the `Assets` -key of the [application options](../reference/options#application-options). +key of the [application options](../reference/options.mdx#application-options). ### Project Configuration diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/overscroll.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/overscroll.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/overscroll.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/overscroll.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/routing.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/routing.mdx similarity index 94% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/routing.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/routing.mdx index 7551e110f..3e1f255d8 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/routing.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/guides/routing.mdx @@ -20,7 +20,7 @@ const router = createRouter({ ## Angular -The recommended approach for routing in Angular is [HashLocationStrategy](https://codecraft.tv/courses/angular/routing/routing-strategies/#_hashlocationstrategy): +The recommended approach for routing in Angular is [HashLocationStrategy](https://codecraft.tv/courses/angular/routing/routing-strategies#_hashlocationstrategy): ```ts RouterModule.forRoot(routes, {useHash: true}) diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/signing.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/signing.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/signing.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/signing.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/templates.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/templates.mdx similarity index 98% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/templates.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/templates.mdx index 824fb6eb9..090cf8a9e 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/guides/templates.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/guides/templates.mdx @@ -4,7 +4,7 @@ Wails generates projects from pre-created templates. In v1, this was a difficult to maintain set of projects that were subject to going out of date. In v2, to empower the community, a couple of new features have been added for templates: -- Ability to generate projects from [Remote Templates](../reference/cli#remote-templates) +- Ability to generate projects from [Remote Templates](../reference/cli.mdx#remote-templates) - Tooling to help create your own templates ## Creating Templates @@ -91,5 +91,5 @@ Publishing a template is simply pushing the files to GitHub. The following best - Remove any unwanted files and directories (such as `.git`) from your frontend directory - Ensure that `template.json` is complete, especially `helpurl` - Push the files to GitHub -- Create a PR on the [Community Templates](../community/templates) page +- Create a PR on the [Community Templates](../community/templates.mdx) page - Announce the template on the [Template Announcement](https://github.com/wailsapp/wails/discussions/825) discussion board diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/troubleshooting.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/troubleshooting.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/troubleshooting.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/troubleshooting.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/windows-installer.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/windows-installer.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/windows-installer.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/windows-installer.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/guides/windows.mdx b/website/versioned_docs/version-v2.0.0-beta.37/guides/windows.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/guides/windows.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/guides/windows.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/howdoesitwork.mdx b/website/versioned_docs/version-v2.0.0-beta.37/howdoesitwork.mdx similarity index 57% rename from website/versioned_docs/version-v2.0.0-beta.34/howdoesitwork.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/howdoesitwork.mdx index 4a0872cd3..a66e8cb9a 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/howdoesitwork.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/howdoesitwork.mdx @@ -83,7 +83,7 @@ This example has the following options set: - `OnShutdown` - A callback for when the application is about to quit - `Bind` - A slice of struct instances that we wish to expose to the frontend -A full list of application options can be found in the [Options Reference](./reference/options). +A full list of application options can be found in the [Options Reference](reference/options). #### Assets @@ -108,24 +108,25 @@ the application. When running in development mode using the `wails dev` command, the assets are loaded off disk, and any changes result in a "live reload". The location of the assets will be inferred from the `embed.FS`. -More details can be found in the [Application Development Guide](./guides/application-development). +More details can be found in the [Application Development Guide](guides/application-development.mdx). #### Application Lifecycle Callbacks -Just before the frontend is about to load `index.html`, a callback is made to the function provided in [OnStartup](./reference/options#OnStartup). +Just before the frontend is about to load `index.html`, a callback is made to the function provided in [OnStartup](reference/options.mdx#onstartup). A standard Go context is passed to this method. This context is required when calling the runtime so a standard pattern is to save -a reference to in this method. Just before the application shuts down, the [OnShutdown](./reference/options#OnShutdown) callback is called in the same way, -again with the context. There is also an [OnDomReady](./reference/options#OnDomReady) callback for when the frontend +a reference to in this method. Just before the application shuts down, the [OnShutdown](reference/options.mdx#onshutdown) callback is called in the same way, +again with the context. There is also an [OnDomReady](reference/options.mdx#ondomready) callback for when the frontend has completed loading all assets in `index.html` and is equivalent of the [`body onload`](https://www.w3schools.com/jsref/event_onload.asp) event in Javascript. It is also possible to hook into the window close (or application quit) event by setting the -option [OnBeforeClose](./reference/options#OnBeforeClose). +option [OnBeforeClose](reference/options.mdx#onbeforeclose). #### Method Binding The `Bind` option is one of the most important options in a Wails application. It specifies which struct methods -to expose to the frontend. When the application starts, it examines the struct instances listed in the `Bind` field in -the options, determines which methods are public (starts with an uppercase letter) and will generate Javascript versions -of those methods that can be called by the frontend code. +to expose to the frontend. Think of structs like "controllers" in a traditional web application. When the application +starts, it examines the struct instances listed in the `Bind` field in the options, determines which methods are +public (starts with an uppercase letter) and will generate Javascript versions of those methods that can be called +by the frontend code. :::info Note @@ -135,7 +136,7 @@ of those methods that can be called by the frontend code. In this example, we create a new `App` instance and then add this instance to the `Bind` option in `wails.Run`: -```go {16,26} title="main.go" +```go {16,24} title="main.go" package main import ( @@ -158,8 +159,6 @@ func main() { Width: 1024, Height: 768, Assets: &assets, - OnStartup: app.startup, - OnShutdown: app.shutdown, Bind: []interface{}{ app, }, @@ -174,67 +173,41 @@ type App struct { ctx context.Context } -func (b *App) startup(ctx context.Context) { - b.ctx = ctx -} - -func (b *App) shutdown(ctx context.Context) {} - -func (b *App) Greet(name string) string { +func (a *App) Greet(name string) string { return fmt.Sprintf("Hello %s!", name) } ``` You may bind as many structs as you like. Just make sure you create an instance of it and pass it in `Bind`: -```go {10-12} -... +```go {8-10} + //... err := wails.Run(&options.App{ Title: "Basic Demo", Width: 1024, Height: 768, Assets: &assets, - OnStartup: app.startup, - OnShutdown: app.shutdown, Bind: []interface{}{ app, &mystruct1{}, &mystruct2{}, }, }) -... + ``` -The bound methods are located in the frontend at `window.go...`. -In the example above, we bind `app`, which has one public method `Greet`. -This can be called in Javascript by calling `window.go.main.App.Greet`. -These methods return a Promise. A successful call will result in the first return value from the Go call to be passed -to the `resolve` handler. An unsuccessful call is when a Go method that has an error type as it's second return value, -passes an error instance back to the caller. This is passed back via the `reject` handler. -In the example above, `Greet` only returns a `string` so the Javascript call will never reject - unless invalid data -is passed to it. +When you run `wails dev` (or `wails generate module`), a frontend module will be generated containing the following: + - Javascript bindings for all bound methods + - Typescript declarations for all bound methods + - Typescript definitions for all Go structs used as inputs or outputs by the bound methods -All data types are correctly translated between Go and Javascript. Even structs. If you return a struct from a Go call, -it will be returned to your frontend as a Javascript map. Note: If you wish to use structs, you **must** define `json` struct -tags for your fields! - -:::info Note -Anonymous nested structs are not supported at this time. -::: - -It is also possible to send structs back to Go. Any Javascript map passed as an argument that -is expecting a struct, will be converted to that struct type. To make this process a lot easier, in `dev` mode, -a TypeScript module is generated, defining all the struct types used in bound methods. Using this module, it's possible -to construct and send native Javascript objects to the Go code. - -More information on Binding can be found in the [Binding Methods](./guides/application-development#binding-methods) -section of the [Application Development Guide](./guides/application-development). +This makes it incredibly simple to call Go code from the frontend, using the same strongly typed datastructures. ## The Frontend ### Overview -The frontend is a collection of files rendered by webkit. It's like a browser and webserver in one. +The frontend is a collection of files rendered by webkit. It''s like a browser and webserver in one. There is virtually[^1] no limit to which frameworks or libraries you can use. The main points of interaction between the frontend and your Go code are: @@ -247,48 +220,61 @@ the frontend and your Go code are: ### Calling bound Go methods -All bound Go methods are available at `window.go...`. As stated in -the previous section, these return a Promise where a successful call returns a value to the -resolve handler and an error returns a value to the reject handler. +When you run your application with `wails dev`, it will automatically generate Javascript bindings for your structs in a +directory called `wailsjs/go` (You can also do this by running `wails generate module`). The generated files mirror the +package names in your application. In the example above, we bind `app`, which has one public method `Greet`. This will +lead to the generation of the following files: -```go title="mycode.js" -window.go.main.App.Greet("Bill").then((result) => { - console.log("The greeting is: " + result); -}) +```bash +wailsjs + └─go + └─main + ├─App.d.ts + └─App.js +``` +Here we can see that there is a `main` package that contains the Javascript bindings for the bound `App` struct, as well +as the Typescript declaration file for those methods. To call `Greet` from our frontend, we simply import the method and +call it like a regular Javascript function: + +```javascript + // ... + import {Greet} from '../wailsjs/go/main/App' + + function doGreeting(name) { + Greet(name).then((result) => { + // Do something with result + }) + } +``` +The Typescript declaration file gives you the correct types for the bound methods: + +```ts +export function Greet(arg1:string):Promise; ``` -When running the application in `dev` mode, a javascript module is generated that wraps these -methods with JSDoc annotations. This really help with development, especially as most -IDEs will process JSDoc to provide code completion and type hinting. This module is called `go` -and is generated in the directory specified by the `wailsjsdir` flag. In this module is a file -called `bindings.js` containing these wrappers. For the above example, the file contains the -following code: +The generated methods return a Promise. A successful call will result in the first return value from the Go call to be passed +to the `resolve` handler. An unsuccessful call is when a Go method that has an error type as it''s second return value, +passes an error instance back to the caller. This is passed back via the `reject` handler. +In the example above, `Greet` only returns a `string` so the Javascript call will never reject - unless invalid data +is passed to it. -```js title="bindings.js" -const go = { - main: { - App: { - /** - * Greet - * @param {Person} arg1 - Go Type: string - * @returns {Promise} - Go Type: string - */ - Greet: (arg1) => { - return window.go.main.App.Greet(arg1); - }, - }, - }, -}; -export default go; -``` +All data types are correctly translated between Go and Javascript. Even structs. If you return a struct from a Go call, +it will be returned to your frontend as a Javascript class. Note: If you wish to use structs, you **must** define +`json` struct tags for your fields! -#### Support for structs +:::info Note +Anonymous nested structs are not supported at this time. +::: -There is also additional support for Go methods that use structs in their signature. All Go structs -specified by bound method (either as parameters or return types) will have Typescript versions auto -generated as part of the Go code wrapper module. Using these, it's possible to share the same data -model between Go and Javascript. These models align with the JSDoc annotations, empowering IDE code -completion. +It is possible to send structs back to Go. Any Javascript map/class passed as an argument that +is expecting a struct, will be converted to that struct type. To make this process a lot easier, in `dev` mode, +a TypeScript module is generated, defining all the struct types used in bound methods. Using this module, it''s possible +to construct and send native Javascript objects to the Go code. + +There is also support for Go methods that use structs in their signature. All Go structs +specified by a bound method (either as parameters or return types) will have Typescript versions auto +generated as part of the Go code wrapper module. Using these, it''s possible to share the same data +model between Go and Javascript. Example: We update our `Greet` method to accept a `Person` instead of a string: @@ -309,76 +295,77 @@ func (a *App) Greet(p Person) string { } ``` -Our `bindings.js` file has now been updated to reflect the change: +The `wailsjs/go/main/App.js` file will still have the following code: -```js title="bindings.js" -const go = { - main: { - App: { - /** - * Greet - * @param {Person} arg1 - Go Type: main.Person - * @returns {Promise} - Go Type: string - */ - Greet: (arg1) => { - return window.go.main.App.Greet(arg1); - }, - }, - }, -}; -export default go; +```js title="App.js" +export function Greet(arg1) { + return window['go']['main']['App']['Greet'](arg1); +} ``` -Alongside `bindings.js`, there is a file called `models.ts`. This contains our Go structs in TypeScript form: +But the `wailsjs/go/main/App.d.ts` file will be updated with the following code: + +```ts title="App.d.ts" +import {main} from '../models'; + +export function Greet(arg1:main.Person):Promise; +``` + +As we can see, the "main" namespace is imported from a new "models.ts" file. This file contains all the struct definitions +used by our bound methods. In this example, this is a `Person` struct. If we look at `models.ts`, we can see how the models +are defined: ```ts title="models.ts" -export class Address { - street: string; - postcode: string; +export namespace main { - static createFrom(source: any = {}) { - return new Address(source); - } + export class Address { + street: string; + postcode: string; - constructor(source: any = {}) { - if ("string" === typeof source) source = JSON.parse(source); - this.street = source["street"]; - this.postcode = source["postcode"]; - } -} -export class Person { - name: string; - age: number; - address?: Address; + static createFrom(source: any = {}) { + return new Address(source); + } - static createFrom(source: any = {}) { - return new Person(source); - } + constructor(source: any = {}) { + if ('string' === typeof source) source = JSON.parse(source); + this.street = source["street"]; + this.postcode = source["postcode"]; + } + } + export class Person { + name: string; + age: number; + address?: Address; - constructor(source: any = {}) { - if ("string" === typeof source) source = JSON.parse(source); - this.name = source["name"]; - this.age = source["age"]; - this.address = this.convertValues(source["address"], Address); - } + static createFrom(source: any = {}) { + return new Person(source); + } - convertValues(a: any, classs: any, asMap: boolean = false): any { - if (!a) { - return a; - } - if (a.slice) { - return (a as any[]).map((elem) => this.convertValues(elem, classs)); - } else if ("object" === typeof a) { - if (asMap) { - for (const key of Object.keys(a)) { - a[key] = new classs(a[key]); - } - return a; - } - return new classs(a); - } - return a; - } + constructor(source: any = {}) { + if ('string' === typeof source) source = JSON.parse(source); + this.name = source["name"]; + this.age = source["age"]; + this.address = this.convertValues(source["address"], Address); + } + + convertValues(a: any, classs: any, asMap: boolean = false): any { + if (!a) { + return a; + } + if (a.slice) { + return (a as any[]).map(elem => this.convertValues(elem, classs)); + } else if ("object" === typeof a) { + if (asMap) { + for (const key of Object.keys(a)) { + a[key] = new classs(a[key]); + } + return a; + } + return new classs(a); + } + return a; + } + } } ``` @@ -386,22 +373,23 @@ So long as you have TypeScript as part of your frontend build configuration, you the following way: ```js title="mycode.js" -import go from "./wailsjs/go/bindings"; -import { Person } from "./wailsjs/go/models"; + import {Greet} from '../wailsjs/go/main/App' + import {main} from '../wailsjs/go/models' -let name = ""; - -function greet(name) { - let p = new Person(); - p.name = name; - p.age = 42; - go.main.App.Greet(p).then((result) => { - console.log(result); - }); -} + function generate() { + let person = new main.Person() + person.name = "Peter" + person.age = 27 + Greet(person).then((result) => { + console.log(result) + }) + } ``` -The combination of JSDoc and TypeScript generated models makes for a powerful development environment. +The combination of generated bindings and TypeScript models makes for a powerful development environment. + +More information on Binding can be found in the [Binding Methods](guides/application-development.mdx#binding-methods) +section of the [Application Development Guide](guides/application-development.mdx). ### Calling runtime methods @@ -412,4 +400,4 @@ tasks such as emit an event or perform logging operations: window.runtime.EventsEmit("my-event", 1); ``` -More details about the JS runtime can be found in the [Runtime Reference](./reference/runtime/intro). +More details about the JS runtime can be found in the [Runtime Reference](reference/runtime/intro). diff --git a/website/versioned_docs/version-v2.0.0-beta.34/introduction.mdx b/website/versioned_docs/version-v2.0.0-beta.37/introduction.mdx similarity index 91% rename from website/versioned_docs/version-v2.0.0-beta.34/introduction.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/introduction.mdx index 7663f46a0..846b21e1d 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/introduction.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/introduction.mdx @@ -21,6 +21,12 @@ gives it that 'frosty' effect of a native app.

+## Quick Start Templates + +Wails comes with a number of pre-configured templates that allow you to get your application up and running quickly. +There are templates for the following frameworks: Svelte, React, Vue, Preact, Lit and Vanilla. There are both Javascript +and Typescript versions for each template. + ## Native Elements Wails uses a purpose built library for handling native elements such as Window, Menus, Dialogs, etc, so you can build diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/_category_.json b/website/versioned_docs/version-v2.0.0-beta.37/reference/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.37/reference/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/cli.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/cli.mdx similarity index 88% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/cli.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/cli.mdx index 30a6466c3..4dcc55931 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/cli.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/reference/cli.mdx @@ -29,7 +29,7 @@ Example: This will generate a a project called "test" in the "mytestproject" directory, initialise git, generate vscode project files and do so silently. -More information on using IDEs with Wails can be found [here](/docs/guides/ides). +More information on using IDEs with Wails can be found [here](../guides/ides.mdx). ### Remote Templates @@ -38,7 +38,7 @@ Remote templates (hosted on GitHub) are supported and can be installed by using Example: `wails init -n test -t https://github.com/leaanthony/testtemplate[@v1.0.0]` -A list of community maintained templates can be found [here](/docs/community/templates) +A list of community maintained templates can be found [here](../community/templates.mdx) :::warning Attention @@ -54,7 +54,7 @@ A list of community maintained templates can be found [here](/docs/community/tem | Flag | Description | Default | | :------------------- | :-------------------------------------- | :------------------------- | -| -platform | Build for the given (comma delimited) [platforms](/docs/reference/cli#platforms) eg. `windows/arm64`. Note, if you do not give the architecture, `runtime.GOARCH` is used. | runtime.GOOS/runtime.GOARCH | +| -platform | Build for the given (comma delimited) [platforms](../reference/cli.mdx#platforms) eg. `windows/arm64`. Note, if you do not give the architecture, `runtime.GOARCH` is used. | runtime.GOOS/runtime.GOARCH | | -clean | Cleans the `build/bin` directory | | | -compiler "compiler"| Use a different go compiler to build, eg go1.15beta1 | go | | -ldflags "flags" | Additional ldflags to pass to the compiler | | @@ -69,10 +69,11 @@ A list of community maintained templates can be found [here](/docs/community/tem | -webview2 | WebView2 installer strategy: download,embed,browser,error | download | | -u | Updates your project's `go.mod` to use the same version of Wails as the CLI | | | -debug | Retains debug information in the application | false | +| -trimpath | Remove all file system paths from the resulting executable. | false | -For a detailed description of the `webview2` flag, please refer to the [Windows](/docs/guides/windows) Guide. +For a detailed description of the `webview2` flag, please refer to the [Windows](../guides/windows.mdx) Guide. -If you prefer to build using standard Go tooling, please consult the [Manual Builds](/docs/guides/manual-builds) +If you prefer to build using standard Go tooling, please consult the [Manual Builds](../guides/manual-builds.mdx) guide. Example: @@ -169,12 +170,12 @@ Your system is ready for Wails development! | -noreload | Disable automatic reload when assets change | | | -v | Verbosity level (0 - silent, 1 - standard, 2 - verbose) | 1 | | -wailsjsdir | The directory to generate the generated Wails JS modules | Value in `wails.json` | -| -debounce | The time to wait for reload after an asset change is detected | 100 (milliseconds) | -| -devserverurl "url" | Use 3rd party dev server url, EG Vite | "http://localhost:34115" | +| -debounce | The time to wait for reload after an asset change is detected | 100 (milliseconds) | +| -devserver "host:port" | The address to bind the wails dev server to | "localhost:34115" | +| -frontenddevserverurl "url" | Use 3rd party dev server url to serve assets, EG Vite | "" | | -appargs "args" | Arguments passed to the application in shell style | | | -platform "platform" | Platform/Arch to target | `runtime.GOOS` | -| -save | Saves the given `assetdir`, `reloaddirs`, `wailsjsdir`, `debounce` and `devserverurl` flags in - `wails.json` to become the defaults for subsequent invocations. | | +| -save | Saves the given `assetdir`, `reloaddirs`, `wailsjsdir`, `debounce`, `devserver` and `frontenddevserverurl` flags in `wails.json` to become the defaults for subsequent invocations. | | Example: @@ -182,12 +183,12 @@ Example: This command will do the following: - - Build the application and run it (more details [here](/docs/guides/manual-builds) + - Build the application and run it (more details [here](../guides/manual-builds.mdx) - Generate the Wails JS modules in `./frontend/src` - Watch for updates to files in `./frontend/dist` and reload on any change - Open a browser and connect to the application -There is more information on using this feature with existing framework scripts [here](/docs/guides/application-development#live-reloading). +There is more information on using this feature with existing framework scripts [here](../guides/application-development.mdx#live-reloading). ## generate @@ -201,7 +202,7 @@ it may be used for generating projects. | -name | The template name (Mandatory) | | -frontend "path" | Path to frontend project to use in template | -For more details on creating templates, consult the [Templates guide](/docs/guides/templates). +For more details on creating templates, consult the [Templates guide](../guides/templates.mdx). ## update @@ -215,4 +216,4 @@ For more details on creating templates, consult the [Templates guide](/docs/guid ## version -`wails version` will simply output the current CLI version. \ No newline at end of file +`wails version` will simply output the current CLI version. diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/menus.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/menus.mdx similarity index 99% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/menus.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/menus.mdx index cfbdbe440..bab623586 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/reference/menus.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/reference/menus.mdx @@ -254,7 +254,7 @@ using radio groups that may share a callback. :::info Roles -Roles are currently supported on Mac only. + Roles are currently supported on Mac only. ::: diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/options.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/options.mdx similarity index 98% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/options.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/options.mdx index 23de4e51e..eb3177633 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/reference/options.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/reference/options.mdx @@ -649,16 +649,14 @@ func main() { The "About" menu item will appear in the app menu:
- +

When clicked, that will open an about message box:
- +

diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/project-config.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/project-config.mdx similarity index 94% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/project-config.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/project-config.mdx index 178504a63..de612d5f7 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/reference/project-config.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/reference/project-config.mdx @@ -19,7 +19,7 @@ The project config resides in the `wails.json` file in the project directory. Th "wailsjsdir": "[Relative path to the directory that the auto-generated JS modules will be created]", "version": "[Project config version]", "outputfilename": "[The name of the binary]", - "debounceMS": 100, // The default time the dev server waits to reload when it detects a vhange in assets + "debounceMS": 100, // The default time the dev server waits to reload when it detects a change in assets "devServer": "[Address to bind the wails dev sever to. Default: localhost:34115]", "appargs": "[Arguments passed to the application in shell style when in dev mode]", "runNonNativeBuildHooks": false, // Defines if build hooks should be run though they are defined for an OS other than the host OS. @@ -35,7 +35,7 @@ The project config resides in the `wails.json` file in the project directory. Th "copyright": "[The copyright of the product. Default: 'Copyright.........']", "comments": "[A short comment of the app. Default: 'Built using Wails (https://wails.app)']" }, - "nsisType": "['multiple': One installer per achitecture. 'single': Single universal installer for all architectures being built. Default: 'multiple']" + "nsisType": "['multiple': One installer per architecture. 'single': Single universal installer for all architectures being built. Default: 'multiple']" } ``` diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/_category_.json b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/browser.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/browser.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/browser.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/browser.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/dialog.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/dialog.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/dialog.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/dialog.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/events.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/events.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/events.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/events.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/intro.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/intro.mdx similarity index 95% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/intro.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/intro.mdx index b3616f689..583c84791 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/intro.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/intro.mdx @@ -32,7 +32,7 @@ Quits the application. ### Environment -Go Signature: `Enviromnent(ctx context.Context) EnvironmentInfo` +Go Signature: `Environment(ctx context.Context) EnvironmentInfo` Returns details of the current environment. diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/log.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/log.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/log.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/log.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/menu.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/menu.mdx similarity index 87% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/menu.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/menu.mdx index 6180577ec..7d2d01783 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/menu.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/menu.mdx @@ -15,7 +15,7 @@ These methods are related to the application menu. ### MenuSetApplicationMenu Go Signature: `MenuSetApplicationMenu(ctx context.Context, menu *menu.Menu)` -Sets the application menu to the given [menu](../../reference/menus) . +Sets the application menu to the given [menu](../menus.mdx) . ### MenuUpdateApplicationMenu Go Signature: `MenuUpdateApplicationMenu(ctx context.Context)` diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/window.mdx b/website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/window.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/window.mdx rename to website/versioned_docs/version-v2.0.0-beta.37/reference/runtime/window.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/appendix/_category_.json b/website/versioned_docs/version-v2.0.0-beta.38/appendix/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/appendix/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.38/appendix/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/_category_.json b/website/versioned_docs/version-v2.0.0-beta.38/community/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.38/community/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/links.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/links.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/links.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/links.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/_category_.json b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/encrypteasy.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/encrypteasy.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/encrypteasy.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/encrypteasy.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/filehound.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/filehound.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/filehound.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/filehound.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/mollywallet.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/mollywallet.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/mollywallet.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/mollywallet.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/october.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/october.mdx new file mode 100644 index 000000000..83bc64672 --- /dev/null +++ b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/october.mdx @@ -0,0 +1,11 @@ +# October + +

+
+

+ +[October](https://october.utf9k.net) is a small Wails application that makes it really easy to extract highlights from [Kobo eReaders](https://en.wikipedia.org/wiki/Kobo_eReader) and then forward them to [Readwise](https://readwise.io). + +It has a relatively small scope with all platform versions weighing in under 10MB, and that's without enabling [UPX compression](https://upx.github.io/)! + +In contrast, the author's previous attempts with Electron quickly bloated to several hundred megabytes. \ No newline at end of file diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/optimus.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/optimus.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/optimus.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/optimus.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/portfall.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/portfall.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/portfall.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/portfall.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/riftshare.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/riftshare.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/riftshare.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/riftshare.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/surge.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/surge.mdx new file mode 100644 index 000000000..e2facf648 --- /dev/null +++ b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/surge.mdx @@ -0,0 +1,8 @@ +# Surge + +

+
+

+ +[Surge](https://getsurge.io/) is a p2p filesharing app designed to utilize blockchain technologies to enable 100% anonymous file transfers. Surge is end-to-end encrypted, decentralized and open source. + diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/wally.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/wally.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/wally.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/wally.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/wombat.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/wombat.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/wombat.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/wombat.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/showcase/ytd.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/showcase/ytd.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/community/showcase/ytd.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/showcase/ytd.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/community/templates.mdx b/website/versioned_docs/version-v2.0.0-beta.38/community/templates.mdx similarity index 95% rename from website/versioned_docs/version-v2.0.0-beta.35/community/templates.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/community/templates.mdx index 076a6b041..6d090bb3d 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/community/templates.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/community/templates.mdx @@ -35,6 +35,7 @@ If you are unsure about a template, inspect `package.json` and `wails.json` for - [wails-react-template](https://github.com/AlienRecall/wails-react-template) - A template using reactjs - [wails-react-template](https://github.com/flin7/wails-react-template) - A minimal template for React that supports live development +- [wails-template-nextjs](https://github.com/LGiki/wails-template-nextjs) - A template using Next.js and TypeScript ## Svelte diff --git a/website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/_category_.json b/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/building.mdx b/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/building.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/building.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/building.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/development.mdx b/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/development.mdx similarity index 64% rename from website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/development.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/development.mdx index 67a9a6443..323e90ba9 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/gettingstarted/development.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/development.mdx @@ -7,9 +7,10 @@ sidebar_position: 5 You can run your application in development mode by running `wails dev` from your project directory. This will do the following things: - Build your application and run it - - Watch for modifications in your Go files and rebuild/re-run on change - - Sets up a [webserver](http://localhost:34115) that will serve your application over a browser. This allows you to use your favourite browser extensions. You can even call your Go code from the console. + - Bind your Go code to the frontend so it can be called from Javascript + - Using the power of [vite](https://vitejs.dev/), will watch for modifications in your Go files and rebuild/re-run on change + - Sets up a [webserver](http://localhost:34115) that will serve your application over a browser. This allows you to use your favourite browser extensions. You can even call your Go code from the console -To get started, run `wails dev` in the project directory. More information on this can be found [here](../reference/cli#dev). +To get started, run `wails dev` in the project directory. More information on this can be found [here](../reference/cli.mdx#dev). Coming soon: Tutorial \ No newline at end of file diff --git a/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/firstproject.mdx b/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/firstproject.mdx new file mode 100644 index 000000000..b5ee1fa46 --- /dev/null +++ b/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/firstproject.mdx @@ -0,0 +1,127 @@ +--- +sidebar_position: 2 +--- + +# Creating a Project + +## Project Generation + +Now that the CLI is installed, you can generate a new project by using the `wails init` command. + +Pick your favourite framework: + + + + +import Tabs from "@theme/Tabs"; +import TabItem from "@theme/TabItem"; + + + + Generate a Svelte project using Javascript with:
+ + wails init -n myproject -t svelte + + If you would rather use Typescript: + + wails init -n myproject -t svelte-ts + + + Generate a React project using Javascript with:
+ + wails init -n myproject -t react + + If you would rather use Typescript: + + wails init -n myproject -t react-ts + + + Generate a Vue project using Javascript with:
+ + wails init -n myproject -t vue + + If you would rather use Typescript: + + wails init -n myproject -t vue-ts + + + Generate a Preact project using Javascript with:
+ + wails init -n myproject -t preact + + If you would rather use Typescript: + + wails init -n myproject -t preact-ts + + + Generate a Lit project using Javascript with:
+ + wails init -n myproject -t lit + + If you would rather use Typescript: + + wails init -n myproject -t lit-ts + + + Generate a Vanilla project using Javascript with:
+ + wails init -n myproject -t vanilla + + If you would rather use Typescript: + + wails init -n myproject -t vanilla-ts + + + +
+ +There are also [community templates](../community/templates.mdx) available that offer different capabilities and frameworks. + +To see the other options available, you can run `wails init -help`. +More details can be found in the [CLI Reference](../reference/cli.mdx#init). + +## Project Layout + +Wails projects have the following layout: + +``` +. +├── build/ +│ ├── appicon.png +│ ├── darwin/ +│ └── windows/ +├── frontend/ +├── go.mod +├── go.sum +├── main.go +└── wails.json +``` + +### Project structure rundown + +- `/main.go` - The main application +- `/frontend/` - Frontend project files +- `/build/` - Project build directory +- `/build/appicon.png` - The application icon +- `/build/darwin/` - Mac specific project files +- `/build/windows/` - Windows specific project files +- `/wails.json` - The project configuration +- `/go.mod` - Go module file +- `/go.sum` - Go module checksum file + +The `frontend` directory has nothing specific to Wails and can be any frontend project of your choosing. + +The `build` directory is used during the build process. These files may be updated to customise your builds. If +files are removed from the build directory, default versions will be regenerated. + +The default module name in `go.mod` is "changeme". You should change this to something more appropriate. diff --git a/website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/installation.mdx b/website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/installation.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/gettingstarted/installation.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/gettingstarted/installation.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/_category_.json b/website/versioned_docs/version-v2.0.0-beta.38/guides/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.38/guides/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/application-development.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/application-development.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/application-development.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/application-development.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/bleeding-edge.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/bleeding-edge.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/bleeding-edge.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/bleeding-edge.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/developing-wails.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/developing-wails.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/developing-wails.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/developing-wails.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/frameless.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/frameless.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/frameless.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/frameless.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/frontend.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/frontend.mdx similarity index 97% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/frontend.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/frontend.mdx index 2ace49c4e..7b94345ad 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/guides/frontend.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/guides/frontend.mdx @@ -2,7 +2,7 @@ ## Script Injection -When Wails serves your `index.html`, by default, it will inject 2 script entries into the `` tag to load `/wails/bindings.js` +When Wails serves your `index.html`, by default, it will inject 2 script entries into the `` tag to load `/wails/ipc.js` and `/wails/runtime.js`. These files install the bindings and runtime respectively. The code below shows where these are injected by default: diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/ides.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/ides.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/ides.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/ides.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/linux-distro-support.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/linux-distro-support.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/linux-distro-support.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/linux-distro-support.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/manual-builds.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/manual-builds.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/manual-builds.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/manual-builds.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/migrating.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/migrating.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/migrating.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/migrating.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/overscroll.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/overscroll.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/overscroll.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/overscroll.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/routing.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/routing.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/routing.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/routing.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/signing.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/signing.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/signing.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/signing.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/templates.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/templates.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/templates.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/templates.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/troubleshooting.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/troubleshooting.mdx similarity index 77% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/troubleshooting.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/troubleshooting.mdx index 83b6b9972..4aa119ee9 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/guides/troubleshooting.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/guides/troubleshooting.mdx @@ -21,7 +21,7 @@ If your built application looks like this in finder:

-it's likely that your application's `info.plist` is invalid. Update the file in `build/.app/Contents/info.plist` +it''s likely that your application''s `info.plist` is invalid. Update the file in `build/.app/Contents/info.plist` and check if the data is valid, EG check the binary name is correct. To persist the changes, copy the file back to the `build/darwin` directory. @@ -55,7 +55,7 @@ window.go.main.App.TestFunc(msg, args).then((result) => { //without the 3 dots ``` Credit: https://github.com/wailsapp/wails/issues/1186 -## I'm having getting proxy errors when trying to install Wails +## I''m having getting proxy errors when trying to install Wails If you are getting errors like this: ``` @@ -67,4 +67,10 @@ The solution is to set up the proxy manually, eg: go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.cn,direct ``` -Source: https://github.com/wailsapp/wails/issues/1233 \ No newline at end of file +Source: https://github.com/wailsapp/wails/issues/1233 + +## The generated Typescript doesn''t have the correct types + +Sometimes the generated Typescript doesn''t have the correct types. To mitigate this, +it is possible to specify what types should be generated using the `ts_type` struct tag. For +more details, please read [this](https://github.com/tkrajina/typescriptify-golang-structs#custom-types). \ No newline at end of file diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/windows-installer.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/windows-installer.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/windows-installer.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/windows-installer.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/guides/windows.mdx b/website/versioned_docs/version-v2.0.0-beta.38/guides/windows.mdx similarity index 70% rename from website/versioned_docs/version-v2.0.0-beta.35/guides/windows.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/guides/windows.mdx index 53e456825..e3c2ee027 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/guides/windows.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/guides/windows.mdx @@ -34,3 +34,20 @@ up to the user. ### Error If no suitable runtime is found, an error is given to the user and no further action taken. + +## Fixed version runtime + +Another way of dealing with webview2 dependency is shipping it yourself. +You can download [fixed version runtime](https://developer.microsoft.com/ru-ru/microsoft-edge/webview2/#download-section) and bundle or download it with your application. + +Also, you should specify path to fixed version of webview2 runtime in the `windows.Options` structure when launching wails. + +```go + wails.Run(&options.App{ + Windows: &windows.Options{ + WebviewBrowserPath: "", + }, + }) +``` + +Note: When `WebviewBrowserPath` is specified, `error` strategy will be forced in case of minimal required version mismatch or invalid path to a runtime. \ No newline at end of file diff --git a/website/versioned_docs/version-v2.0.0-beta.35/howdoesitwork.mdx b/website/versioned_docs/version-v2.0.0-beta.38/howdoesitwork.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/howdoesitwork.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/howdoesitwork.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/introduction.mdx b/website/versioned_docs/version-v2.0.0-beta.38/introduction.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/introduction.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/introduction.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/_category_.json b/website/versioned_docs/version-v2.0.0-beta.38/reference/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.38/reference/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/cli.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/cli.mdx similarity index 96% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/cli.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/cli.mdx index e6abde76a..f83c210da 100644 --- a/website/versioned_docs/version-v2.0.0-beta.35/reference/cli.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/reference/cli.mdx @@ -70,6 +70,7 @@ If you are unsure about a template, inspect `package.json` and `wails.json` for | -u | Updates your project's `go.mod` to use the same version of Wails as the CLI | | | -debug | Retains debug information in the application | false | | -trimpath | Remove all file system paths from the resulting executable. | false | +| -race | Build with Go's race detector | false | For a detailed description of the `webview2` flag, please refer to the [Windows](../guides/windows.mdx) Guide. @@ -168,6 +169,7 @@ Your system is ready for Wails development! | -tags "extra tags" | Build tags to pass to compiler (quoted and space separated) | | | -loglevel "loglevel"| Loglevel to use - Trace, Debug, Info, Warning, Error | Debug | | -noreload | Disable automatic reload when assets change | | +| -nogen | Disable generate module | | | -v | Verbosity level (0 - silent, 1 - standard, 2 - verbose) | 1 | | -wailsjsdir | The directory to generate the generated Wails JS modules | Value in `wails.json` | | -debounce | The time to wait for reload after an asset change is detected | 100 (milliseconds) | @@ -175,8 +177,8 @@ Your system is ready for Wails development! | -frontenddevserverurl "url" | Use 3rd party dev server url to serve assets, EG Vite | "" | | -appargs "args" | Arguments passed to the application in shell style | | | -platform "platform" | Platform/Arch to target | `runtime.GOOS` | -| -save | Saves the given `assetdir`, `reloaddirs`, `wailsjsdir`, `debounce`, `devserver` and `frontenddevserverurl` flags in -`wails.json` to become the defaults for subsequent invocations. | | +| -save | Saves the given `assetdir`, `reloaddirs`, `wailsjsdir`, `debounce`, `devserver` and `frontenddevserverurl` flags in `wails.json` to become the defaults for subsequent invocations. | | +| -race | Build with Go's race detector | false | Example: @@ -217,4 +219,4 @@ For more details on creating templates, consult the [Templates guide](../guides/ ## version -`wails version` will simply output the current CLI version. \ No newline at end of file +`wails version` will simply output the current CLI version. diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/menus.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/menus.mdx similarity index 81% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/menus.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/menus.mdx index ea5e47367..94f08b2e2 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/menus.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/reference/menus.mdx @@ -5,27 +5,38 @@ sidebar_position: 4 # Menus It is possible to add an application menu to Wails projects. This is achieved by defining a [Menu](#menu) struct and -setting the [`Menu`](../reference/options#menu) option, or by calling the runtime method [MenuSetApplicationMenu](../reference/runtime/menu#menusetapplicationmenu). +setting it in the [`Menu`](../reference/options.mdx#menu) application config, or by calling the runtime method +[MenuSetApplicationMenu](../reference/runtime/menu.mdx#menusetapplicationmenu). -It is also possible to dynamically update the menu, by updating the menu struct and calling -[MenuUpdateApplicationMenu](../reference/runtime/menu#menuupdateapplicationmenu). - -Example: +An example of how to create a menu: ```go - myMenu := menu.NewMenuFromItems( - menu.SubMenu("File", menu.NewMenuFromItems( - menu.Text("&Open", keys.CmdOrCtrl("o"), openFile), - menu.Separator(), - menu.Text("Quit", keys.CmdOrCtrl("q"), func(_ *menu.CallbackData) { - runtime.Quit() - }), - )), + AppMenu := menu.NewMenu() + FileMenu := AppMenu.AddSubmenu("File") + FileMenu.AddText("&Open", keys.CmdOrCtrl("o"), openFile) + FileMenu.AddSeparator() + FileMenu.AddText("Quit", keys.CmdOrCtrl("q"), func(_ *menu.CallbackData) { + runtime.Quit() + }) + + if runtime.GOOS == "darwin" { + AppMenu.Append(menu.EditMenu()) // on macos platform, we should append EditMenu to enable Cmd+C,Cmd+V,Cmd+Z... shortcut + } + + err := wails.Run(&options.App{ + Title: "Menus Demo", + Width: 800, + Height: 600, + Menu: AppMenu, + Bind: []interface{}{ + app, + }, ) + // ... +```` - runtime.MenuSetApplicationMenu(myMenu) - -``` +It is also possible to dynamically update the menu, by updating the menu struct and calling +[MenuUpdateApplicationMenu](../reference/runtime/menu.mdx#menuupdateapplicationmenu). The example above uses helper methods, however it's possible to build the menu structs manually. @@ -211,8 +222,18 @@ func Text(label string, accelerator *keys.Accelerator, click Callback) *MenuItem func Separator() *MenuItem func Radio(label string, selected bool, accelerator *keys.Accelerator, click Callback) *MenuItem func Checkbox(label string, checked bool, accelerator *keys.Accelerator, click Callback) *MenuItem -func SubMenu(label string, menu *Menu) *MenuItem +func SubMenu(label string, menu *Menu) *Menu ``` +You can also create menu items directly on a menu by using the "Add" helpers: + +```go title="Package: github.com/wailsapp/wails/v2/pkg/menu" +func (m *Menu) AddText(label string, accelerator *keys.Accelerator, click Callback) *MenuItem +func (m *Menu) AddSeparator() *MenuItem +func (m *Menu) AddRadio(label string, selected bool, accelerator *keys.Accelerator, click Callback) *MenuItem +func (m *Menu) AddCheckbox(label string, checked bool, accelerator *keys.Accelerator, click Callback) *MenuItem +func (m *Menu) AddSubMenu(label string, menu *Menu) *MenuI +``` + A note on radio groups: A radio group is defined as a number of radio menu items that are next to each other in the menu. This means that you do not need to group items together as it is automatic. However, that also means you cannot have 2 @@ -237,7 +258,7 @@ using radio groups that may share a callback. :::info Roles - Roles are currently supported on Mac only. +Roles are currently supported on Mac only. ::: diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/options.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/options.mdx similarity index 66% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/options.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/options.mdx index 4b55ead0e..b946f6d52 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/options.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/reference/options.mdx @@ -27,9 +27,10 @@ func main() { MaxHeight: 1024, StartHidden: false, HideWindowOnClose: false, - RGBA: &options.RGBA{R: 0, G: 0, B: 0, A: 255}, + BackgroundColour: &options.RGBA{R: 0, G: 0, B: 0, A: 255}, AlwaysOnTop: false, Assets: assets, + AssetsHandler: assetsHandler, Menu: app.applicationMenu(), Logger: nil, LogLevel: logger.DEBUG, @@ -47,6 +48,7 @@ func main() { DisableWindowIcon: false, DisableFramelessWindowDecorations: false, WebviewUserDataPath: "", + WebviewBrowserPath: "", Theme: windows.SystemDefault, CustomTheme: &windows.ThemeSettings{ DarkModeTitleBar: windows.RGB(20, 20, 20), @@ -56,6 +58,8 @@ func main() { LightModeTitleText: windows.RGB(20, 20, 20), LightModeBorder: windows.RGB(200, 200, 200), }, + // User messages that can be customised + Messages *windows.Messages }, Mac: &mac.Options{ TitleBar: &mac.TitleBar{ @@ -75,6 +79,9 @@ func main() { Icon: icon, }, }, + Linux: &linux.Options{ + Icon: icon, + }, }) if err != nil { log.Fatal(err) @@ -134,7 +141,7 @@ Name: Frameless Type: bool When set to `true`, the window will have no borders or title bar. -Also see [Frameless Windows](../guides/frameless). +Also see [Frameless Windows](../guides/frameless.mdx). ### MinWidth @@ -178,7 +185,7 @@ Name: StartHidden Type: bool -When set to `true`, the application will be hidden until [WindowShow](../reference/runtime/window#WindowShow) +When set to `true`, the application will be hidden until [WindowShow](../reference/runtime/window.mdx#windowshow) is called. ### HideWindowOnClose @@ -190,14 +197,14 @@ Type: bool By default, closing the window will close the application. Setting this to `true` means closing the window will hide the window instead. -### RGBA +### BackgroundColour -Name: RGBA +Name: BackgroundColour Type: int (0xRRGGBBAA) Example: 0xFF000088 - Red at 50% transparency -This value is the RGBA value to set the window by default. +This value is the default background colour of the window. Default: 0xFFFFFFFF. ### AlwaysOnTop @@ -212,17 +219,49 @@ Indicates that the window should stay above other windows when losing focus. Name: Assets -Type: \*embed.FS +Type: embed.FS The frontend assets to be used by the application. Requires an `index.html` file. +### AssetsHandler + + +Name: AssetsHandler + +Type: http.Handler + + +The assets handler is a generic `http.Handler` which will be called for any non GET request on the assets server +and for GET requests which can not be served from the `assets` because the file is not found. + +| Value | Win | Mac | Lin | +| ----------------------------- | --- | --- | --- | +| GET | ✅ | ✅ | ✅ | +| POST | ✅ | ✅ | ❌ | +| PUT | ✅ | ✅ | ❌ | +| PATCH | ✅ | ✅ | ❌ | +| DELETE | ✅ | ✅ | ❌ | +| Request Headers | ✅ | ✅ | ❌ | +| Request Body | ✅ | ✅ | ❌ | +| Request Body Streaming | ❌ | ❌ | ❌ | +| Response StatusCodes | ✅ | ✅ | ❌ | +| Response Headers | ✅ | ✅ | ❌ | +| Response Body | ✅ | ✅ | ✅ | +| Response Body Streaming | ❌ | ❌ | ✅ | + +NOTE: Linux is currently very limited due to targeting a WebKit2GTK Version < 2.36.0. In the future some features will be +supported by the introduction of WebKit2GTK 2.36.0+ support. + +NOTE: When used in combination with a Frontend DevServer there might be limitations, eg. Vite serves the index.html +on every path, that does not contain a file extension. + ### Menu Name: Menu Type: \*menu.Menu -The menu to be used by the application. More details about Menus in the [Menu Reference](../reference/runtime/menu). +The menu to be used by the application. More details about Menus in the [Menu Reference](../reference/runtime/menu.mdx). NOTE: On Mac, if no menu is specified, a default menu will be created. @@ -234,7 +273,7 @@ Type: logger.Logger Default: Logger to Stdout -The logger to be used by the application. More details about logging in the [Log Reference](../reference/runtime/log). +The logger to be used by the application. More details about logging in the [Log Reference](../reference/runtime/log.mdx). ### LogLevel @@ -244,7 +283,7 @@ Type: logger.LogLevel Default: `Info` in dev mode, `Error` in production mode -The default log level. More details about logging in the [Log Reference](../reference/runtime/log). +The default log level. More details about logging in the [Log Reference](../reference/runtime/log.mdx). ### OnStartup @@ -311,7 +350,7 @@ Defines how the window should present itself at startup. | --------------- | --- | --- | --- | | Fullscreen | ✅ | ✅ | ✅ | | Maximised | ✅ | ✅ | ✅ | -| Minimised | ✅ | | ✅ | +| Minimised | ✅ | ❌ | ✅ | ### Bind @@ -337,6 +376,14 @@ Type: \*mac.Options This defines [Mac specific options](#mac-specific-options). +### Linux + +Name: Linux + +Type: \*linux.Options + +This defines [Linux specific options](#linux-specific-options). + ## Windows Specific Options ### WebviewIsTransparent @@ -346,7 +393,7 @@ Name: WebviewIsTransparent Type: bool Setting this to `true` will make the webview background transparent when an alpha value of `0` is used. -This means that if you use `rgba(0,0,0,0)`, the host window will show through. +This means that if you use `rgba(0,0,0,0)` for `background-color` in your CSS, the host window will show through. Often combined with [WindowIsTranslucent](#WindowIsTranslucent) to make frosty-looking applications. ### WindowIsTranslucent @@ -384,6 +431,127 @@ Type: string This defines the path where the WebView2 stores the user data. If empty `%APPDATA%\[BinaryName.exe]` will be used. +### WebviewBrowserPath + +Name: WebviewBrowserPath + +Type: string + +This defines the path to a directory with WebView2 executable files and libraries. If empty, webview2 installed in the system will be used. + +Important information about distribution of fixed version runtime: +- [How to get and extract runtime](https://docs.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#details-about-the-fixed-version-runtime-distribution-mode) +- [Known issues for fixed version](https://docs.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#known-issues-for-fixed-version) +- [The path of fixed version of the WebView2 Runtime should not contain \Edge\Application\.](https://docs.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/webview2-idl?view=webview2-1.0.1245.22#createcorewebview2environmentwithoptions) + +### Theme + +Name: Theme + +Type: `windows.Theme` + +Minimum Windows Version: Windows 10 2004/20H1 + +This defines the theme that the application should use: + +| Value | Description | +| --------------- | ----------- | +| SystemDefault | *Default*. The theme will be based on the system default. If the user changes their theme, the application will update to use the new setting | +| Dark | The application will use a dark theme exclusively | +| Light | The application will use a light theme exclusively | + + +### CustomTheme + +Name: CustomTheme + +Type: `windows.CustomTheme` + +Minimum Windows Version: Windows 10/11 2009/21H2 Build 22000 + +Allows you to specify custom colours for TitleBar, TitleText and Border for both light and dark mode, as well as +when the window is active or inactive. + +#### CustomTheme + +The CustomTheme struct uses `int32` to specify the colour values. These are in the standard(!) Windows format of: +`0x00BBGGAA`. A helper function is provided to do RGB conversions into this format: `windows.RGB(r,g,b uint8)`. + +NOTE: Any value not provided will default to black. + +```go +type ThemeSettings struct { + DarkModeTitleBar int32 + DarkModeTitleBarInactive int32 + DarkModeTitleText int32 + DarkModeTitleTextInactive int32 + DarkModeBorder int32 + DarkModeBorderInactive int32 + LightModeTitleBar int32 + LightModeTitleBarInactive int32 + LightModeTitleText int32 + LightModeTitleTextInactive int32 + LightModeBorder int32 + LightModeBorderInactive int32 +} +``` + +Example: +```go + CustomTheme: &windows.ThemeSettings{ + // Theme to use when window is active + DarkModeTitleBar: windows.RGB(255, 0, 0), // Red + DarkModeTitleText: windows.RGB(0, 255, 0), // Green + DarkModeBorder: windows.RGB(0, 0, 255), // Blue + LightModeTitleBar: windows.RGB(200, 200, 200), + LightModeTitleText: windows.RGB(20, 20, 20), + LightModeBorder: windows.RGB(200, 200, 200), + // Theme to use when window is inactive + DarkModeTitleBarInactive: windows.RGB(128, 0, 0), + DarkModeTitleTextInactive: windows.RGB(0, 128, 0), + DarkModeBorderInactive: windows.RGB(0, 0, 128), + LightModeTitleBarInactive: windows.RGB(100, 100, 100), + LightModeTitleTextInactive: windows.RGB(10, 10, 10), + LightModeBorderInactive: windows.RGB(100, 100, 100), + }, +``` + +### Messages + +Name: Messages + +Type: `*windows.Messages` + +A struct of strings used by the webview2 installer if a valid webview2 runtime is not found. +Customise this for any language you choose to support. + +### ResizeDebounceMS + +Name: ResizeDebounceMS + +Type: uint16 + +ResizeDebounceMS is the amount of time to debounce redraws of webview2 when resizing the window. +The default value (0) will perform redraws as fast as it can. + +### OnSuspend + +Name: OnSuspend + +Type: func() + +If set, this function will be called when windows initiates a switch to low power mode (suspend/hibernate) + +### OnResume + +Name: OnResume + +Type: func() + +If set, this function will be called when windows resumes from low power mode (suspend/hibernate) + + + ## Mac Specific Options ### TitleBar @@ -409,7 +577,7 @@ Name: WebviewIsTransparent Type: bool Setting this to `true` will make the webview background transparent when an alpha value of `0` is used. -This means that if you use `rgba(0,0,0,0)`, the host window will show through. +This means that if you use `rgba(0,0,0,0)` for `background-color` in your CSS, the host window will show through. Often combined with [WindowIsTranslucent](#WindowIsTranslucent) to make frosty-looking applications. ### WindowIsTranslucent @@ -446,7 +614,7 @@ type TitleBar struct { | Name | Description | | ---- | ----------- | -| TitlebarAppearsTransparent | Makes the titlebar transparent. [Apple Docs](https://developer.apple.com/documentation/appkit/nswindow/1419167-titlebarappearstransparent?language=objc) | +| TitlebarAppearsTransparent | Makes the titlebar transparent. This has the effect of hiding the titlebar and the content fill the window. [Apple Docs](https://developer.apple.com/documentation/appkit/nswindow/1419167-titlebarappearstransparent?language=objc) | | HideTitle | Hides the title of the window. [Apple Docs](https://developer.apple.com/documentation/appkit/nswindowtitlevisibility?language=objc) | | HideTitleBar | Removes [NSWindowStyleMaskTitled](https://developer.apple.com/documentation/appkit/nswindowstylemask/nswindowstylemasktitled/) from the style mask | | FullSizeContent | Makes the webview fill the entire window. [Apple Docs](https://developer.apple.com/documentation/appkit/nswindowstylemask/nswindowstylemaskfullsizecontentview)| @@ -522,14 +690,16 @@ func main() { The "About" menu item will appear in the app menu:
- +

When clicked, that will open an about message box:
- +

diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/project-config.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/project-config.mdx similarity index 80% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/project-config.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/project-config.mdx index 88dab6047..de612d5f7 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/project-config.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/reference/project-config.mdx @@ -14,12 +14,13 @@ The project config resides in the `wails.json` file in the project directory. Th "frontend:install": "[The command to install node dependencies, run in the frontend directory - often `npm install`]", "frontend:build": "[The command to build the assets, run in the frontend directory - often `npm run build`]", "frontend:dev": "[This command is the dev equivalent of frontend:build. If not specified falls back to frontend:build]", - "frontend:dev:watcher": "[This command is run in a separate process on `wails dev`. Useful for 3rd party watchers]", + "frontend:dev:watcher": "[This command is run in a separate process on `wails dev`. Useful for 3rd party watchers or starting 3d party dev servers]", + "frontend:dev:serverUrl": "[URL to a 3rd party dev server to be used to serve assets, EG Vite", "wailsjsdir": "[Relative path to the directory that the auto-generated JS modules will be created]", "version": "[Project config version]", "outputfilename": "[The name of the binary]", - "debounceMS": 100, // The default time the dev server waits to reload when it detects a vhange in assets - "devserverurl": "[URL to the dev server serving local assets. Default: http://localhost:34115]", + "debounceMS": 100, // The default time the dev server waits to reload when it detects a change in assets + "devServer": "[Address to bind the wails dev sever to. Default: localhost:34115]", "appargs": "[Arguments passed to the application in shell style when in dev mode]", "runNonNativeBuildHooks": false, // Defines if build hooks should be run though they are defined for an OS other than the host OS. "postBuildHooks": { @@ -34,11 +35,11 @@ The project config resides in the `wails.json` file in the project directory. Th "copyright": "[The copyright of the product. Default: 'Copyright.........']", "comments": "[A short comment of the app. Default: 'Built using Wails (https://wails.app)']" }, - "nsisType": "['multiple': One installer per achitecture. 'single': Single universal installer for all architectures being built. Default: 'multiple']" + "nsisType": "['multiple': One installer per architecture. 'single': Single universal installer for all architectures being built. Default: 'multiple']" } ``` This file is read by the Wails CLI when running `wails build` or `wails dev`. -The `assetdir`, `reloaddirs`, `wailsjsdir`, `debounceMS` and `devserverurl` flags in `wails build/dev` will update the project config +The `assetdir`, `reloaddirs`, `wailsjsdir`, `debounceMS`, `devserver` and `frontenddevserverurl` flags in `wails build/dev` will update the project config and thus become defaults for subsequent runs. \ No newline at end of file diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/_category_.json b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/_category_.json similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/_category_.json rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/_category_.json diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/browser.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/browser.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/browser.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/browser.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/dialog.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/dialog.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/dialog.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/dialog.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/events.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/events.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/events.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/events.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/intro.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/intro.mdx similarity index 77% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/intro.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/intro.mdx index 0e07084b8..583c84791 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/intro.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/intro.mdx @@ -8,15 +8,15 @@ The runtime is a library that provides utility methods for your application. The and the aim is to try and keep them at parity where possible. The Go Runtime is available through importing `github.com/wailsapp/wails/v2/pkg/runtime`. All methods in this package -take a context as the first parameter. This context should be obtained from the [OnStartup](../../reference/options#onstartup) -or [OnDomReady](../../reference/options#ondomready) hooks. +take a context as the first parameter. This context should be obtained from the [OnStartup](../options.mdx#onstartup) +or [OnDomReady](../options.mdx#ondomready) hooks. :::info Note Whilst the context will be provided to the -[OnStartup](../../reference/options#onstartup) method, there's no guarantee the runtime will work in this method as +[OnStartup](../options.mdx#onstartup) method, there's no guarantee the runtime will work in this method as the window is initialising in a different thread. If -you wish to call runtime methods at startup, use [OnDomReady](../../reference/options#ondomready). +you wish to call runtime methods at startup, use [OnDomReady](../options.mdx#ondomready). ::: @@ -32,7 +32,7 @@ Quits the application. ### Environment -Go Signature: `Enviromnent(ctx context.Context) EnvironmentInfo` +Go Signature: `Environment(ctx context.Context) EnvironmentInfo` Returns details of the current environment. diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/log.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/log.mdx similarity index 69% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/log.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/log.mdx index 50576587c..713838008 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/log.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/log.mdx @@ -27,6 +27,12 @@ JS Signature: `LogPrint(message: string)` Logs the given message as a raw message. +### LogPrintf + +Go Signature: `LogPrintf(ctx context.Context, format string, args ...interface{})` + +Logs the given message as a raw message. + ### LogTrace Go Signature: `LogTrace(ctx context.Context, message string)` @@ -35,6 +41,12 @@ JS Signature: `LogTrace(message: string)` Logs the given message at the `Trace` log level. +### LogTracef + +Go Signature: `LogTracef(ctx context.Context, format string, args ...interface{})` + +Logs the given message at the `Trace` log level. + ### LogDebug Go Signature: `LogDebug(ctx context.Context, message string)` @@ -43,6 +55,11 @@ JS Signature: `LogDebug(message: string)` Logs the given message at the `Debug` log level. +### LogDebugf + +Go Signature: `LogDebugf(ctx context.Context, format string, args ...interface{})` + +Logs the given message at the `Debug` log level. ### LogInfo @@ -52,6 +69,11 @@ JS Signature: `LogInfo(message: string)` Logs the given message at the `Info` log level. +### LogInfof + +Go Signature: `LogInfof(ctx context.Context, format string, args ...interface{})` + +Logs the given message at the `Info` log level. ### LogWarning @@ -61,6 +83,11 @@ JS Signature: `LogWarning(message: string)` Logs the given message at the `Warning` log level. +### LogWarningf + +Go Signature: `LogWarningf(ctx context.Context, format string, args ...interface{})` + +Logs the given message at the `Warning` log level. ### LogError @@ -70,14 +97,26 @@ JS Signature: `LogError(message: string)` Logs the given message at the `Error` log level. +### LogErrorf + +Go Signature: `LogErrorf(ctx context.Context, format string, args ...interface{})` + +Logs the given message at the `Error` log level. ### LogFatal + Go Signature: `LogFatal(ctx context.Context, message string)` JS Signature: `LogFatal(message: string)` Logs the given message at the `Fatal` log level. +### LogFatalf + +Go Signature: `LogFatalf(ctx context.Context, format string, args ...interface{})` + +Logs the given message at the `Fatal` log level. + ### LogSetLogLevel Go Signature: `LogSetLogLevel(ctx context.Context, level logger.LogLevel)` @@ -96,7 +135,7 @@ Sets the log level. In Javascript, the number relates to the following log level ## Using a Custom Logger -A custom logger may be used by providing it using the [Logger](../../reference/options#logger) +A custom logger may be used by providing it using the [Logger](../options.mdx#logger) application option. The only requirement is that the logger implements the `logger.Logger` interface defined in `github.com/wailsapp/wails/v2/pkg/logger`: diff --git a/website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/menu.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/menu.mdx similarity index 100% rename from website/versioned_docs/version-v2.0.0-beta.35/reference/runtime/menu.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/menu.mdx diff --git a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/window.mdx b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/window.mdx similarity index 81% rename from website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/window.mdx rename to website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/window.mdx index cef929ad6..c3a493d2e 100644 --- a/website/versioned_docs/version-v2.0.0-beta.34/reference/runtime/window.mdx +++ b/website/versioned_docs/version-v2.0.0-beta.38/reference/runtime/window.mdx @@ -41,7 +41,43 @@ Go Signature: `WindowReload(ctx context.Context)` JS Signature: `WindowReload()` -Performs a "reload" (Reloads index.html) +Performs a "reload" (Reloads current page). + +### WindowReloadApp +Go Signature: `WindowReloadApp(ctx context.Context)` + +JS Signature: `WindowReloadApp()` + +Reloads the application frontend. + +### WindowSetSy + +### WindowSetSystemDefaultTheme +Go Signature: `WindowSetSystemDefaultTheme(ctx context.Context)` + +JS Signature: `WindowSetSystemDefaultTheme()` + +Windows only. + +Sets window theme to system default (dark/light). + +### WindowSetLightTheme +Go Signature: `WindowSetLightTheme(ctx context.Context)` + +JS Signature: `WindowSetLightTheme()` + +Windows only. + +Sets window theme to light. + +### WindowSetDarkTheme +Go Signature: `WindowSetDarkTheme(ctx context.Context)` + +JS Signature: `WindowSetDarkTheme()` + +Windows only. + +Sets window theme to dark. ### WindowShow Go Signature: `WindowShow(ctx context.Context)` @@ -91,6 +127,14 @@ Will resize the window if the window is currently larger than the given dimensio Setting a size of `0,0` will disable this constraint. +### WindowSetAlwaysOnTop +Go Signature: `WindowSetAlwaysOnTop(ctx context.Context, b bool)` + +JS Signature: `WindowSetAlwaysOnTop(b: Boolen)` + +Sets the window AlwaysOnTop or not on top. + + ### WindowSetPosition Go Signature: `WindowSetPosition(ctx context.Context, x int, y int)` diff --git a/website/versioned_sidebars/version-v2.0.0-beta.34-sidebars.json b/website/versioned_sidebars/version-v2.0.0-beta.37-sidebars.json similarity index 100% rename from website/versioned_sidebars/version-v2.0.0-beta.34-sidebars.json rename to website/versioned_sidebars/version-v2.0.0-beta.37-sidebars.json diff --git a/website/versioned_sidebars/version-v2.0.0-beta.35-sidebars.json b/website/versioned_sidebars/version-v2.0.0-beta.38-sidebars.json similarity index 100% rename from website/versioned_sidebars/version-v2.0.0-beta.35-sidebars.json rename to website/versioned_sidebars/version-v2.0.0-beta.38-sidebars.json diff --git a/website/versions.json b/website/versions.json index b6fd4043d..3b9e55047 100644 --- a/website/versions.json +++ b/website/versions.json @@ -1,4 +1,4 @@ [ - "v2.0.0-beta.35", - "v2.0.0-beta.34" -] + "v2.0.0-beta.38", + "v2.0.0-beta.37" +] \ No newline at end of file