github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-04 01:19:12 +08:00
Code Projects Activity

[v2] Update to webview2runtime v1.3.0

Browse Source
This commit is contained in:
Lea\Anthony 2021-12-25 08:51:32 +11:00
parent c0f283335a
commit e5732bcee1
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl
View File

@ -22,7 +22,7 @@ github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 // indirect github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 // indirect
github.com/leaanthony/slicer v1.5.0 // indirect github.com/leaanthony/slicer v1.5.0 // indirect
github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
github.com/leaanthony/webview2runtime v1.1.0 // indirect github.com/leaanthony/webview2runtime v1.3.0 // indirect
github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect

2
v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl
View File

@ -22,7 +22,7 @@ github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 // indirect github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 // indirect
github.com/leaanthony/slicer v1.5.0 // indirect github.com/leaanthony/slicer v1.5.0 // indirect
github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
github.com/leaanthony/webview2runtime v1.1.0 // indirect github.com/leaanthony/webview2runtime v1.3.0 // indirect
github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect

4
v2/go.mod
View File

@ -27,7 +27,7 @@ require (
github.com/leaanthony/idgen v1.0.0 github.com/leaanthony/idgen v1.0.0
github.com/leaanthony/slicer v1.5.0 github.com/leaanthony/slicer v1.5.0
github.com/leaanthony/typescriptify-golang-structs v0.1.7 github.com/leaanthony/typescriptify-golang-structs v0.1.7
github.com/leaanthony/webview2runtime v1.1.0 github.com/leaanthony/webview2runtime v1.3.0
github.com/leaanthony/winc v0.0.0-20211202091710-9931d43181ff github.com/leaanthony/winc v0.0.0-20211202091710-9931d43181ff
github.com/leaanthony/winicon v1.0.0 github.com/leaanthony/winicon v1.0.0
github.com/matryer/is v1.4.0 github.com/matryer/is v1.4.0
@ -81,3 +81,5 @@ require (
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect
) )
replace github.com/leaanthony/webview2runtime => C:\Users\leaan\Documents\wails-v2-beta\webview2runtime

6
v2/internal/appng/app_windows.go
View File

@ -15,9 +15,9 @@ func PreflightChecks(options *options.App, logger *logger.Logger) error {
// Process the webview2 runtime situation. We can pass a strategy in via the `webview2` flag for `wails build`. // Process the webview2 runtime situation. We can pass a strategy in via the `webview2` flag for `wails build`.
// This will determine how wv2runtime.Process will handle a lack of valid runtime. // This will determine how wv2runtime.Process will handle a lack of valid runtime.
installedVersion, err := wv2runtime.Process() installedVersion, err := wv2runtime.Process()
if installedVersion != nil { if installedVersion != "" {
logger.Debug("WebView2 Runtime installed: Name: '%s' Version:'%s' Location:'%s'. Minimum version required: %s.", logger.Debug("WebView2 Runtime Version '%s' installed. Minimum version required: %s.",
installedVersion.Name, installedVersion.Version, installedVersion.Location, wv2runtime.MinimumRuntimeVersion) installedVersion, wv2runtime.MinimumRuntimeVersion)
} }
if err != nil { if err != nil {
return err return err

8
v2/internal/ffenestri/windows/wv2runtime/wv2runtime.go
View File

@ -15,14 +15,14 @@ const (
installed installed
) )
func Process() (*webview2runtime.Info, error) { func Process() (string, error) {
installStatus := needsInstalling installStatus := needsInstalling
installedVersion := webview2runtime.GetInstalledVersion() installedVersion := webview2runtime.GetInstalledVersion()
if installedVersion != nil { if installedVersion != "" {
installStatus = installed installStatus = installed
compareResult, err := webviewloader.CompareBrowserVersions(installedVersion.Version, MinimumRuntimeVersion) compareResult, err := webviewloader.CompareBrowserVersions(installedVersion, MinimumRuntimeVersion)
if err != nil { if err != nil {
return nil, err return "", err
} }
updateRequired := compareResult == -1 updateRequired := compareResult == -1
// Installed and does not require updating // Installed and does not require updating