refactor(v3): fold webview2 module into v3/internal/webview2

go.work

@@ -2,5 +2,4 @@ go 1.25.0
 
 use (
 	./v3
-	./webview2
 )

v3/UNRELEASED_CHANGELOG.md

@@ -20,6 +20,7 @@ After processing, the content will be moved to the main changelog and this file
 
 ## Changed
 <!-- Changes in existing functionality -->
+- Fold the `webview2` binding into the v3 module as `v3/internal/webview2`, removing the standalone module, its nightly release/sync workflows, and the go.mod version dance (v3 is its only consumer) in [PR](https://github.com/wailsapp/wails/pull/5711) by @taliesin-ai
 
 ## Fixed
 <!-- Bug fixes -->

v3/go.mod

@@ -30,7 +30,6 @@ require (
 	github.com/stretchr/testify v1.11.1
 	github.com/tc-hib/winres v0.3.1
 	github.com/wailsapp/task/v3 v3.40.1-patched3
-	github.com/wailsapp/wails/webview2 v1.0.28
 	github.com/zalando/go-keyring v0.2.6
 	golang.org/x/sys v0.43.0
 	golang.org/x/term v0.42.0
@@ -109,7 +108,7 @@ require (
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/jaypipes/pcidb v1.1.1 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect
+	github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1
 	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/kevinburke/ssh_config v1.4.0 // indirect
 	github.com/klauspost/compress v1.18.3 // indirect

v3/go.sum

@@ -356,8 +356,6 @@ github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
 github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/wailsapp/task/v3 v3.40.1-patched3 h1:i6O1WNdSur9CGaiMDIYGjsmj/qS4465zqv+WEs6sPRs=
 github.com/wailsapp/task/v3 v3.40.1-patched3/go.mod h1:jIP48r8ftoSQNlxFP4+aEnkvGQqQXqCnRi/B7ROaecE=
-github.com/wailsapp/wails/webview2 v1.0.28 h1:rWBjaGGfzqVOH7TPy1s9VoP8jWNz0gmBd8ZkUKHi0qQ=
-github.com/wailsapp/wails/webview2 v1.0.28/go.mod h1:zdM4jcO1IaC61RiJL5F1BzgoqBHFIdacz8gPr5exr0o=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=

v3/internal/assetserver/webview/request_windows.go

@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/wailsapp/wails/webview2/pkg/edge"
+	"github.com/wailsapp/wails/v3/internal/webview2/pkg/edge"
 )
 
 // NewRequest creates as new WebViewRequest for chromium. This Method must be called from the Main-Thread!

v3/internal/capabilities/capabilities_windows.go

@@ -2,7 +2,7 @@
 
 package capabilities
 
-import "github.com/wailsapp/wails/webview2/webviewloader"
+import "github.com/wailsapp/wails/v3/internal/webview2/webviewloader"
 
 type version string
 

v3/internal/doctor/doctor_windows.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/wailsapp/wails/v3/internal/lo"
-	"github.com/wailsapp/wails/webview2/webviewloader"
+	"github.com/wailsapp/wails/v3/internal/webview2/webviewloader"
 )
 
 func getInfo() (map[string]string, bool) {

webview2/pkg/edge/ICoreWebView2AddScriptToExecuteOnDocumentCreatedCompletedHandler.go → v3/internal/webview2/pkg/edge/ICoreWebView2AddScriptToExecuteOnDocumentCreatedCompletedHandler.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package edge
 
 import (
@@ -61,4 +63,4 @@ func newICoreWebView2AddScriptToExecuteOnDocumentCreatedCompletedHandler(impl _I
 		vtbl: &_ICoreWebView2AddScriptToExecuteOnDocumentCreatedCompletedHandlerFn,
 		impl: impl,
 	}
-}
+}

webview2/pkg/edge/ICoreWebView2Controller.go → v3/internal/webview2/pkg/edge/ICoreWebView2Controller.go

@@ -6,7 +6,7 @@ import (
 	"math"
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
 	"golang.org/x/sys/windows"
 )
 

webview2/pkg/edge/ICoreWebView2Cookie.go → v3/internal/webview2/pkg/edge/ICoreWebView2Cookie.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package edge
 
 import (
@@ -235,4 +237,4 @@ func (i *ICoreWebView2Cookie) QueryInterface(riid *windows.GUID, ppvObject *unsa
 		return windows.Errno(hr)
 	}
 	return nil
-}
+}

webview2/pkg/edge/ICoreWebView2CookieList.go → v3/internal/webview2/pkg/edge/ICoreWebView2CookieList.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package edge
 
 import (
@@ -56,4 +58,4 @@ func (i *ICoreWebView2CookieList) GetItem(index uint32) (*ICoreWebView2Cookie, e
 		return nil, syscall.Errno(hr)
 	}
 	return cookie, nil
-}
+}

webview2/pkg/edge/ICoreWebView2CookieManager.go → v3/internal/webview2/pkg/edge/ICoreWebView2CookieManager.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package edge
 
 import (
@@ -184,4 +186,4 @@ func (i *ICoreWebView2CookieManager) DeleteAllCookies() error {
 		return syscall.Errno(hr)
 	}
 	return nil
-}
+}

webview2/pkg/edge/ICoreWebView2ExecuteScriptCompletedHandler.go → v3/internal/webview2/pkg/edge/ICoreWebView2ExecuteScriptCompletedHandler.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package edge
 
 import (
@@ -61,4 +63,4 @@ func newICoreWebView2ExecuteScriptCompletedHandler(impl _ICoreWebView2ExecuteScr
 		vtbl: &_ICoreWebView2ExecuteScriptCompletedHandlerFn,
 		impl: impl,
 	}
-}
+}

webview2/pkg/edge/ICoreWebView2WebResourceResponse.go → v3/internal/webview2/pkg/edge/ICoreWebView2WebResourceResponse.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
 	"golang.org/x/sys/windows"
 )
 

webview2/pkg/edge/capabilities.go → v3/internal/webview2/pkg/edge/capabilities.go

@@ -1,6 +1,8 @@
+//go:build windows
+
 package edge
 
-import "github.com/wailsapp/wails/webview2/webviewloader"
+import "github.com/wailsapp/wails/v3/internal/webview2/webviewloader"
 
 type Capability string
 
@@ -167,4 +169,4 @@ func HasCapability(webview2RuntimeVersion string, capability Capability) bool {
 		return false
 	}
 	return result >= 0
-}
+}

webview2/pkg/edge/capabilities_test.go → v3/internal/webview2/pkg/edge/capabilities_test.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package edge
 
 import "testing"
@@ -630,4 +632,4 @@ func TestHasCapability(t *testing.T) {
 			}
 		})
 	}
-}
+}

webview2/pkg/edge/chromium.go → v3/internal/webview2/pkg/edge/chromium.go

@@ -16,8 +16,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/internal/w32"
-	"github.com/wailsapp/wails/webview2/webviewloader"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/webviewloader"
 	"golang.org/x/sys/windows"
 )
 

webview2/pkg/edge/chromium_386.go → v3/internal/webview2/pkg/edge/chromium_386.go

@@ -7,7 +7,7 @@ import (
 	"log"
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
 	"golang.org/x/sys/windows"
 )
 

webview2/pkg/edge/chromium_amd64.go → v3/internal/webview2/pkg/edge/chromium_amd64.go

@@ -6,7 +6,7 @@ package edge
 import (
 	"log"
 
-	"github.com/wailsapp/wails/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
 )
 
 func (e *Chromium) SetSize(bounds w32.Rect) {

webview2/pkg/edge/chromium_arm64.go → v3/internal/webview2/pkg/edge/chromium_arm64.go

@@ -7,7 +7,7 @@ import (
 	"log"
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
 	"golang.org/x/sys/windows"
 )
 

webview2/pkg/edge/cookies_test.go → v3/internal/webview2/pkg/edge/cookies_test.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package edge
 
 import (
@@ -7,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/wailsapp/wails/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
 	"golang.org/x/sys/windows"
 )
 
@@ -162,4 +164,4 @@ func TestCookieManager(t *testing.T) {
 		err = cookieManager.DeleteAllCookies()
 		assert.NoError(t, err, "Should delete all cookies without error")
 	})
-}
+}

webview2/pkg/edge/corewebview2.go → v3/internal/webview2/pkg/edge/corewebview2.go

@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/internal/w32"
+	"github.com/wailsapp/wails/v3/internal/webview2/internal/w32"
 
 	"golang.org/x/sys/windows"
 )

webview2/pkg/edge/create_env_go.go → v3/internal/webview2/pkg/edge/create_env_go.go

@@ -5,7 +5,7 @@ package edge
 import (
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/webviewloader"
+	"github.com/wailsapp/wails/v3/internal/webview2/webviewloader"
 )
 
 func createCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataFolder string, environmentCompletedHandle *iCoreWebView2CreateCoreWebView2EnvironmentCompletedHandler, additionalBrowserArgs string) error {

webview2/pkg/edge/create_env_native.go → v3/internal/webview2/pkg/edge/create_env_native.go

@@ -7,7 +7,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/wailsapp/wails/webview2/webviewloader"
+	"github.com/wailsapp/wails/v3/internal/webview2/webviewloader"
 
 	"golang.org/x/sys/windows"
 )