From 4aab1e6b9336a0132eae0522bf0b7437aa066932 Mon Sep 17 00:00:00 2001 From: stffabi Date: Tue, 13 Dec 2022 13:27:50 +0100 Subject: [PATCH] [webview2loader] Promote go loader from experimental to stable (#2199) Default webview2loader is now the go loader --- .../go-webview2/pkg/edge/create_env_go.go | 2 +- .../go-webview2/pkg/edge/create_env_native.go | 2 +- .../go-webview2/webviewloader/env_create.go | 4 ++-- .../webviewloader/env_create_completed.go | 2 +- .../webviewloader/env_create_options.go | 2 +- .../webviewloader/find_dll_installed.go | 2 +- .../go-webview2/webviewloader/native_module.go | 2 +- .../webviewloader/native_module_386.go | 2 +- .../webviewloader/native_module_amd64.go | 2 +- .../webviewloader/native_module_arm64.go | 2 +- .../windows/go-webview2/webviewloader/version.go | 2 +- v2/pkg/commands/build/build.go | 16 ++++++++-------- website/src/pages/changelog.mdx | 1 + 13 files changed, 21 insertions(+), 20 deletions(-) diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go index 0619605af..a43089f8c 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_go.go @@ -1,4 +1,4 @@ -//go:build windows && exp_gowebview2loader +//go:build windows && !native_webview2loader package edge diff --git a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go index a72df06a8..1d1b38b9c 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/pkg/edge/create_env_native.go @@ -1,4 +1,4 @@ -//go:build windows && !exp_gowebview2loader +//go:build windows && native_webview2loader package edge diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go index 9dd603ca1..1c586d2c6 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create.go @@ -1,4 +1,4 @@ -//go:build windows && exp_gowebview2loader +//go:build windows && !native_webview2loader package webviewloader @@ -13,7 +13,7 @@ import ( ) func init() { - fmt.Println("DEB | Using experimental go webview2loader") + fmt.Println("DEB | Using go webview2loader") } type webView2RunTimeType int32 diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_completed.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_completed.go index f48f62e06..a74a2beeb 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_completed.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_completed.go @@ -1,4 +1,4 @@ -//go:build exp_gowebview2loader +//go:build !native_webview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go index 73b81e56c..4bae6064a 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/env_create_options.go @@ -1,4 +1,4 @@ -//go:build windows && exp_gowebview2loader +//go:build windows && !native_webview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go index 066732bc1..7ee171b2a 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/find_dll_installed.go @@ -1,4 +1,4 @@ -//go:build windows && exp_gowebview2loader +//go:build windows && !native_webview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go index 92ab6ebdb..277290cac 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module.go @@ -1,4 +1,4 @@ -//go:build windows && !exp_gowebview2loader +//go:build windows && native_webview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_386.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_386.go index dd621b09e..6e9484eba 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_386.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_386.go @@ -1,4 +1,4 @@ -//go:build !exp_gowebview2loader +//go:build native_webview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_amd64.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_amd64.go index 9c7803593..93f21ac79 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_amd64.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_amd64.go @@ -1,4 +1,4 @@ -//go:build !exp_gowebview2loader +//go:build native_webview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_arm64.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_arm64.go index b23215cb1..9e8cfa6e0 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_arm64.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/native_module_arm64.go @@ -1,4 +1,4 @@ -//go:build !exp_gowebview2loader +//go:build native_webview2loader package webviewloader diff --git a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/version.go b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/version.go index 5b3c1f2f2..07ae0c25a 100644 --- a/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/version.go +++ b/v2/internal/frontend/desktop/windows/go-webview2/webviewloader/version.go @@ -1,4 +1,4 @@ -//go:build exp_gowebview2loader +//go:build !native_webview2loader package webviewloader diff --git a/v2/pkg/commands/build/build.go b/v2/pkg/commands/build/build.go index dd4b6d739..1eaf46c29 100644 --- a/v2/pkg/commands/build/build.go +++ b/v2/pkg/commands/build/build.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/pterm/pterm" - "github.com/samber/lo" + "github.com/wailsapp/wails/v2/internal/staticanalysis" "github.com/wailsapp/wails/v2/pkg/commands/bindings" @@ -333,17 +333,17 @@ func execBuildApplication(builder Builder, options *Options) (string, error) { } if options.Platform == "windows" { - const expWebView2Loader = "exp_gowebview2loader" + const nativeWebView2Loader = "native_webview2loader" - message := "" tags := options.UserTags - if lo.Contains(tags, expWebView2Loader) { - message = "Thanks for testing the new experimental Go native WebView2Loader. Please report your feedback and any bugs you think might be related to using the new loader: https://github.com/wailsapp/wails/issues/2004" + if lo.Contains(tags, nativeWebView2Loader) { + message := "You are using the legacy native WebView2Loader. This loader will be deprecated in the near future. Please report any bugs related to the new loader: https://github.com/wailsapp/wails/issues/2004" + pterm.Warning.Println(message) } else { - tags = append(tags, expWebView2Loader) - message = fmt.Sprintf("An experimental Go native WebView2Loader is available. We would love to hear your feedback about it and invite you to test it by building with `-tags %s`", strings.Join(tags, ",")) + tags = append(tags, nativeWebView2Loader) + message := fmt.Sprintf("Wails is now using th new Go WebView2Loader. If you encounter any issues with it, please report them to https://github.com/wailsapp/wails/issues/2004. You could also use the old legacy loader with `-tags %s`, but keep in mind this will be deprecated in the near future.", strings.Join(tags, ",")) + pterm.Info.Println(message) } - pterm.Info.Println(message) } if options.Platform == "darwin" && options.Mode == Debug { diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx index 6cf1f61c8..dd212ae80 100644 --- a/website/src/pages/changelog.mdx +++ b/website/src/pages/changelog.mdx @@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Improve error message if no `index.html` could be found in the assets and validate assetserver options. Changed by @stffabi in this [PR](https://github.com/wailsapp/wails/pull/2110) +- Promote the Go WebView2Loader from experimental to stable. This means now per default all Wails build use the new loader introduced with `v2.2.0`. The old loader remains usable with build tag `native_webview2loader` for the next few releases. Changed by @stffabi in this [PR](https://github.com/wailsapp/wails/pull/2199) ## v2.2.0 - 2022-11-09