diff --git a/v3/pkg/assetserver/assethandler.go b/v3/internal/assetserver/assethandler.go similarity index 100% rename from v3/pkg/assetserver/assethandler.go rename to v3/internal/assetserver/assethandler.go diff --git a/v3/pkg/assetserver/assethandler_external.go b/v3/internal/assetserver/assethandler_external.go similarity index 100% rename from v3/pkg/assetserver/assethandler_external.go rename to v3/internal/assetserver/assethandler_external.go diff --git a/v3/pkg/assetserver/assetserver.go b/v3/internal/assetserver/assetserver.go similarity index 100% rename from v3/pkg/assetserver/assetserver.go rename to v3/internal/assetserver/assetserver.go diff --git a/v3/pkg/assetserver/assetserver_dev.go b/v3/internal/assetserver/assetserver_dev.go similarity index 100% rename from v3/pkg/assetserver/assetserver_dev.go rename to v3/internal/assetserver/assetserver_dev.go diff --git a/v3/pkg/assetserver/assetserver_legacy.go b/v3/internal/assetserver/assetserver_legacy.go similarity index 96% rename from v3/pkg/assetserver/assetserver_legacy.go rename to v3/internal/assetserver/assetserver_legacy.go index 44f50a5f..69629da9 100644 --- a/v3/pkg/assetserver/assetserver_legacy.go +++ b/v3/internal/assetserver/assetserver_legacy.go @@ -4,7 +4,7 @@ import ( "io" "net/http" - "github.com/wailsapp/wails/v3/pkg/assetserver/webview" + "github.com/wailsapp/wails/v3/internal/assetserver/webview" ) // ProcessHTTPRequest processes the HTTP Request by faking a golang HTTP Server. diff --git a/v3/pkg/assetserver/assetserver_webview.go b/v3/internal/assetserver/assetserver_webview.go similarity index 98% rename from v3/pkg/assetserver/assetserver_webview.go rename to v3/internal/assetserver/assetserver_webview.go index 698db5d4..85ee25b7 100644 --- a/v3/pkg/assetserver/assetserver_webview.go +++ b/v3/internal/assetserver/assetserver_webview.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/wailsapp/wails/v3/pkg/assetserver/webview" + "github.com/wailsapp/wails/v3/internal/assetserver/webview" ) type assetServerWebView struct { diff --git a/v3/pkg/assetserver/common.go b/v3/internal/assetserver/common.go similarity index 100% rename from v3/pkg/assetserver/common.go rename to v3/internal/assetserver/common.go diff --git a/v3/pkg/assetserver/content_type_sniffer.go b/v3/internal/assetserver/content_type_sniffer.go similarity index 100% rename from v3/pkg/assetserver/content_type_sniffer.go rename to v3/internal/assetserver/content_type_sniffer.go diff --git a/v3/pkg/assetserver/defaultindex.html b/v3/internal/assetserver/defaultindex.html similarity index 100% rename from v3/pkg/assetserver/defaultindex.html rename to v3/internal/assetserver/defaultindex.html diff --git a/v3/pkg/assetserver/fs.go b/v3/internal/assetserver/fs.go similarity index 100% rename from v3/pkg/assetserver/fs.go rename to v3/internal/assetserver/fs.go diff --git a/v3/pkg/assetserver/middleware.go b/v3/internal/assetserver/middleware.go similarity index 100% rename from v3/pkg/assetserver/middleware.go rename to v3/internal/assetserver/middleware.go diff --git a/v3/pkg/assetserver/mimecache.go b/v3/internal/assetserver/mimecache.go similarity index 100% rename from v3/pkg/assetserver/mimecache.go rename to v3/internal/assetserver/mimecache.go diff --git a/v3/pkg/assetserver/mimecache_test.go b/v3/internal/assetserver/mimecache_test.go similarity index 100% rename from v3/pkg/assetserver/mimecache_test.go rename to v3/internal/assetserver/mimecache_test.go diff --git a/v3/pkg/assetserver/options.go b/v3/internal/assetserver/options.go similarity index 100% rename from v3/pkg/assetserver/options.go rename to v3/internal/assetserver/options.go diff --git a/v3/pkg/assetserver/ringqueue.go b/v3/internal/assetserver/ringqueue.go similarity index 100% rename from v3/pkg/assetserver/ringqueue.go rename to v3/internal/assetserver/ringqueue.go diff --git a/v3/pkg/assetserver/testdata/index.html b/v3/internal/assetserver/testdata/index.html similarity index 100% rename from v3/pkg/assetserver/testdata/index.html rename to v3/internal/assetserver/testdata/index.html diff --git a/v3/pkg/assetserver/testdata/main.css b/v3/internal/assetserver/testdata/main.css similarity index 100% rename from v3/pkg/assetserver/testdata/main.css rename to v3/internal/assetserver/testdata/main.css diff --git a/v3/pkg/assetserver/testdata/main.js b/v3/internal/assetserver/testdata/main.js similarity index 100% rename from v3/pkg/assetserver/testdata/main.js rename to v3/internal/assetserver/testdata/main.js diff --git a/v3/pkg/assetserver/testdata/subdir/index.html b/v3/internal/assetserver/testdata/subdir/index.html similarity index 100% rename from v3/pkg/assetserver/testdata/subdir/index.html rename to v3/internal/assetserver/testdata/subdir/index.html diff --git a/v3/pkg/assetserver/testdata/subdir/main.css b/v3/internal/assetserver/testdata/subdir/main.css similarity index 100% rename from v3/pkg/assetserver/testdata/subdir/main.css rename to v3/internal/assetserver/testdata/subdir/main.css diff --git a/v3/pkg/assetserver/testdata/subdir/main.js b/v3/internal/assetserver/testdata/subdir/main.js similarity index 100% rename from v3/pkg/assetserver/testdata/subdir/main.js rename to v3/internal/assetserver/testdata/subdir/main.js diff --git a/v3/pkg/assetserver/testdata/testdata.go b/v3/internal/assetserver/testdata/testdata.go similarity index 100% rename from v3/pkg/assetserver/testdata/testdata.go rename to v3/internal/assetserver/testdata/testdata.go diff --git a/v3/pkg/assetserver/webview/request.go b/v3/internal/assetserver/webview/request.go similarity index 100% rename from v3/pkg/assetserver/webview/request.go rename to v3/internal/assetserver/webview/request.go diff --git a/v3/pkg/assetserver/webview/request_darwin.go b/v3/internal/assetserver/webview/request_darwin.go similarity index 100% rename from v3/pkg/assetserver/webview/request_darwin.go rename to v3/internal/assetserver/webview/request_darwin.go diff --git a/v3/pkg/assetserver/webview/request_finalizer.go b/v3/internal/assetserver/webview/request_finalizer.go similarity index 100% rename from v3/pkg/assetserver/webview/request_finalizer.go rename to v3/internal/assetserver/webview/request_finalizer.go diff --git a/v3/pkg/assetserver/webview/request_linux.go b/v3/internal/assetserver/webview/request_linux.go similarity index 100% rename from v3/pkg/assetserver/webview/request_linux.go rename to v3/internal/assetserver/webview/request_linux.go diff --git a/v3/pkg/assetserver/webview/request_linux_purego.go b/v3/internal/assetserver/webview/request_linux_purego.go similarity index 100% rename from v3/pkg/assetserver/webview/request_linux_purego.go rename to v3/internal/assetserver/webview/request_linux_purego.go diff --git a/v3/pkg/assetserver/webview/responsewriter.go b/v3/internal/assetserver/webview/responsewriter.go similarity index 100% rename from v3/pkg/assetserver/webview/responsewriter.go rename to v3/internal/assetserver/webview/responsewriter.go diff --git a/v3/pkg/assetserver/webview/responsewriter_darwin.go b/v3/internal/assetserver/webview/responsewriter_darwin.go similarity index 100% rename from v3/pkg/assetserver/webview/responsewriter_darwin.go rename to v3/internal/assetserver/webview/responsewriter_darwin.go diff --git a/v3/pkg/assetserver/webview/responsewriter_linux.go b/v3/internal/assetserver/webview/responsewriter_linux.go similarity index 100% rename from v3/pkg/assetserver/webview/responsewriter_linux.go rename to v3/internal/assetserver/webview/responsewriter_linux.go diff --git a/v3/pkg/assetserver/webview/responsewriter_linux_purego.go b/v3/internal/assetserver/webview/responsewriter_linux_purego.go similarity index 100% rename from v3/pkg/assetserver/webview/responsewriter_linux_purego.go rename to v3/internal/assetserver/webview/responsewriter_linux_purego.go diff --git a/v3/pkg/assetserver/webview/webkit2_36+.go b/v3/internal/assetserver/webview/webkit2_36+.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_36+.go rename to v3/internal/assetserver/webview/webkit2_36+.go diff --git a/v3/pkg/assetserver/webview/webkit2_36+_purego.go b/v3/internal/assetserver/webview/webkit2_36+_purego.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_36+_purego.go rename to v3/internal/assetserver/webview/webkit2_36+_purego.go diff --git a/v3/pkg/assetserver/webview/webkit2_36.go b/v3/internal/assetserver/webview/webkit2_36.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_36.go rename to v3/internal/assetserver/webview/webkit2_36.go diff --git a/v3/pkg/assetserver/webview/webkit2_40+.go b/v3/internal/assetserver/webview/webkit2_40+.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_40+.go rename to v3/internal/assetserver/webview/webkit2_40+.go diff --git a/v3/pkg/assetserver/webview/webkit2_40+_purego.go b/v3/internal/assetserver/webview/webkit2_40+_purego.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_40+_purego.go rename to v3/internal/assetserver/webview/webkit2_40+_purego.go diff --git a/v3/pkg/assetserver/webview/webkit2_40.go b/v3/internal/assetserver/webview/webkit2_40.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_40.go rename to v3/internal/assetserver/webview/webkit2_40.go diff --git a/v3/pkg/assetserver/webview/webkit2_legacy.go b/v3/internal/assetserver/webview/webkit2_legacy.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_legacy.go rename to v3/internal/assetserver/webview/webkit2_legacy.go diff --git a/v3/pkg/assetserver/webview/webkit2_legacy_purego.go b/v3/internal/assetserver/webview/webkit2_legacy_purego.go similarity index 100% rename from v3/pkg/assetserver/webview/webkit2_legacy_purego.go rename to v3/internal/assetserver/webview/webkit2_legacy_purego.go diff --git a/v3/pkg/application/application.go b/v3/pkg/application/application.go index 6ff616f2..d659af40 100644 --- a/v3/pkg/application/application.go +++ b/v3/pkg/application/application.go @@ -16,8 +16,8 @@ import ( "github.com/samber/lo" - "github.com/wailsapp/wails/v3/pkg/assetserver" - "github.com/wailsapp/wails/v3/pkg/assetserver/webview" + "github.com/wailsapp/wails/v3/internal/assetserver" + "github.com/wailsapp/wails/v3/internal/assetserver/webview" wailsruntime "github.com/wailsapp/wails/v3/internal/runtime" "github.com/wailsapp/wails/v3/pkg/events" diff --git a/v3/pkg/application/application_darwin.go b/v3/pkg/application/application_darwin.go index b87d64a7..bbe105bd 100644 --- a/v3/pkg/application/application_darwin.go +++ b/v3/pkg/application/application_darwin.go @@ -128,7 +128,7 @@ import "C" import ( "unsafe" - "github.com/wailsapp/wails/v3/pkg/assetserver/webview" + "github.com/wailsapp/wails/v3/internal/assetserver/webview" "github.com/wailsapp/wails/v3/pkg/events" ) diff --git a/v3/pkg/application/linux_cgo.go b/v3/pkg/application/linux_cgo.go index ca172784..ba3191e6 100644 --- a/v3/pkg/application/linux_cgo.go +++ b/v3/pkg/application/linux_cgo.go @@ -7,7 +7,7 @@ import ( "strings" "unsafe" - "github.com/wailsapp/wails/v3/pkg/assetserver/webview" + "github.com/wailsapp/wails/v3/internal/assetserver/webview" "github.com/wailsapp/wails/v3/pkg/events" ) diff --git a/v3/pkg/application/linux_purego.go b/v3/pkg/application/linux_purego.go index ea859ffb..bfb6a8d0 100644 --- a/v3/pkg/application/linux_purego.go +++ b/v3/pkg/application/linux_purego.go @@ -9,7 +9,7 @@ import ( "unsafe" "github.com/ebitengine/purego" - "github.com/wailsapp/wails/v3/pkg/assetserver/webview" + "github.com/wailsapp/wails/v3/internal/assetserver/webview" "github.com/wailsapp/wails/v3/pkg/events" ) diff --git a/v3/pkg/application/plugins.go b/v3/pkg/application/plugins.go index 69247272..ce64eae5 100644 --- a/v3/pkg/application/plugins.go +++ b/v3/pkg/application/plugins.go @@ -1,6 +1,6 @@ package application -import "github.com/wailsapp/wails/v3/pkg/assetserver" +import "github.com/wailsapp/wails/v3/internal/assetserver" type Plugin interface { Name() string diff --git a/v3/pkg/application/webview_window_windows.go b/v3/pkg/application/webview_window_windows.go index a0839f9d..938f1f45 100644 --- a/v3/pkg/application/webview_window_windows.go +++ b/v3/pkg/application/webview_window_windows.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/bep/debounce" "github.com/wailsapp/go-webview2/webviewloader" + "github.com/wailsapp/wails/v3/internal/assetserver" "github.com/wailsapp/wails/v3/internal/capabilities" - "github.com/wailsapp/wails/v3/pkg/assetserver" "io" "net/http" "net/http/httptest"