diff --git a/v2/internal/app/app_dev.go b/v2/internal/app/app_dev.go index 91a47fbf1..32c27fa2e 100644 --- a/v2/internal/app/app_dev.go +++ b/v2/internal/app/app_dev.go @@ -12,8 +12,9 @@ import ( "os" "path/filepath" + "github.com/wailsapp/wails/v2/pkg/assetserver" + "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/internal/frontend/assetserver" "github.com/wailsapp/wails/v2/internal/frontend/desktop" "github.com/wailsapp/wails/v2/internal/frontend/devserver" "github.com/wailsapp/wails/v2/internal/frontend/dispatcher" diff --git a/v2/internal/frontend/desktop/darwin/frontend.go b/v2/internal/frontend/desktop/darwin/frontend.go index 062c9307e..07437a541 100644 --- a/v2/internal/frontend/desktop/darwin/frontend.go +++ b/v2/internal/frontend/desktop/darwin/frontend.go @@ -23,9 +23,10 @@ import ( "net/url" "strconv" + "github.com/wailsapp/wails/v2/pkg/assetserver" + "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/runtime" "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/pkg/options" diff --git a/v2/internal/frontend/desktop/linux/frontend.go b/v2/internal/frontend/desktop/linux/frontend.go index 6794e40b1..ca3101c4f 100644 --- a/v2/internal/frontend/desktop/linux/frontend.go +++ b/v2/internal/frontend/desktop/linux/frontend.go @@ -87,9 +87,10 @@ import ( "text/template" "unsafe" + "github.com/wailsapp/wails/v2/pkg/assetserver" + "github.com/wailsapp/wails/v2/internal/binding" "github.com/wailsapp/wails/v2/internal/frontend" - "github.com/wailsapp/wails/v2/internal/frontend/assetserver" wailsruntime "github.com/wailsapp/wails/v2/internal/frontend/runtime" "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/pkg/options" diff --git a/v2/internal/frontend/desktop/linux/webkit2_36.go b/v2/internal/frontend/desktop/linux/webkit2_36.go index a5669ba08..0c0c382e6 100644 --- a/v2/internal/frontend/desktop/linux/webkit2_36.go +++ b/v2/internal/frontend/desktop/linux/webkit2_36.go @@ -16,7 +16,7 @@ import ( "strings" "unsafe" - "github.com/wailsapp/wails/v2/internal/frontend/assetserver" + "github.com/wailsapp/wails/v2/pkg/assetserver" ) const webkit2MinMinorVersion = 36 diff --git a/v2/internal/frontend/desktop/linux/webkit2_legacy.go b/v2/internal/frontend/desktop/linux/webkit2_legacy.go index d3c1b581b..9d5158f4e 100644 --- a/v2/internal/frontend/desktop/linux/webkit2_legacy.go +++ b/v2/internal/frontend/desktop/linux/webkit2_legacy.go @@ -15,7 +15,7 @@ import ( "net/http" "unsafe" - "github.com/wailsapp/wails/v2/internal/frontend/assetserver" + "github.com/wailsapp/wails/v2/pkg/assetserver" ) const webkit2MinMinorVersion = 0 diff --git a/v2/internal/frontend/desktop/linux/webkit2_responsewriter.go b/v2/internal/frontend/desktop/linux/webkit2_responsewriter.go index 0f858b805..ca3fa65c7 100644 --- a/v2/internal/frontend/desktop/linux/webkit2_responsewriter.go +++ b/v2/internal/frontend/desktop/linux/webkit2_responsewriter.go @@ -21,7 +21,7 @@ import ( "syscall" "unsafe" - "github.com/wailsapp/wails/v2/internal/frontend/assetserver" + "github.com/wailsapp/wails/v2/pkg/assetserver" ) type webKitResponseWriter struct { diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index 34e26e1c2..162be3e28 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -22,7 +22,6 @@ import ( "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" @@ -30,6 +29,7 @@ import ( wailsruntime "github.com/wailsapp/wails/v2/internal/frontend/runtime" "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/system/operatingsystem" + "github.com/wailsapp/wails/v2/pkg/assetserver" "github.com/wailsapp/wails/v2/pkg/options" "github.com/wailsapp/wails/v2/pkg/options/windows" ) diff --git a/v2/internal/frontend/devserver/devserver.go b/v2/internal/frontend/devserver/devserver.go index 7b5f50ce4..8d5003c60 100644 --- a/v2/internal/frontend/devserver/devserver.go +++ b/v2/internal/frontend/devserver/devserver.go @@ -18,12 +18,13 @@ import ( "sync" "time" + "github.com/wailsapp/wails/v2/pkg/assetserver" + "github.com/wailsapp/wails/v2/internal/frontend/runtime" "github.com/labstack/echo/v4" "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/logger" "github.com/wailsapp/wails/v2/internal/menumanager" "github.com/wailsapp/wails/v2/pkg/options" diff --git a/v2/internal/frontend/assetserver/assethandler.go b/v2/pkg/assetserver/assethandler.go similarity index 100% rename from v2/internal/frontend/assetserver/assethandler.go rename to v2/pkg/assetserver/assethandler.go diff --git a/v2/internal/frontend/assetserver/assetserver.go b/v2/pkg/assetserver/assetserver.go similarity index 100% rename from v2/internal/frontend/assetserver/assetserver.go rename to v2/pkg/assetserver/assetserver.go diff --git a/v2/internal/frontend/assetserver/assetserver_dev.go b/v2/pkg/assetserver/assetserver_dev.go similarity index 100% rename from v2/internal/frontend/assetserver/assetserver_dev.go rename to v2/pkg/assetserver/assetserver_dev.go diff --git a/v2/internal/frontend/assetserver/common.go b/v2/pkg/assetserver/common.go similarity index 100% rename from v2/internal/frontend/assetserver/common.go rename to v2/pkg/assetserver/common.go diff --git a/v2/internal/frontend/assetserver/content_type_sniffer.go b/v2/pkg/assetserver/content_type_sniffer.go similarity index 100% rename from v2/internal/frontend/assetserver/content_type_sniffer.go rename to v2/pkg/assetserver/content_type_sniffer.go diff --git a/v2/internal/frontend/assetserver/defaultindex.html b/v2/pkg/assetserver/defaultindex.html similarity index 100% rename from v2/internal/frontend/assetserver/defaultindex.html rename to v2/pkg/assetserver/defaultindex.html diff --git a/v2/internal/frontend/assetserver/fs.go b/v2/pkg/assetserver/fs.go similarity index 100% rename from v2/internal/frontend/assetserver/fs.go rename to v2/pkg/assetserver/fs.go diff --git a/v2/internal/frontend/assetserver/mimecache.go b/v2/pkg/assetserver/mimecache.go similarity index 100% rename from v2/internal/frontend/assetserver/mimecache.go rename to v2/pkg/assetserver/mimecache.go diff --git a/v2/internal/frontend/assetserver/mimecache_test.go b/v2/pkg/assetserver/mimecache_test.go similarity index 100% rename from v2/internal/frontend/assetserver/mimecache_test.go rename to v2/pkg/assetserver/mimecache_test.go diff --git a/v2/internal/frontend/assetserver/testdata/index.html b/v2/pkg/assetserver/testdata/index.html similarity index 100% rename from v2/internal/frontend/assetserver/testdata/index.html rename to v2/pkg/assetserver/testdata/index.html diff --git a/v2/internal/frontend/assetserver/testdata/main.css b/v2/pkg/assetserver/testdata/main.css similarity index 100% rename from v2/internal/frontend/assetserver/testdata/main.css rename to v2/pkg/assetserver/testdata/main.css diff --git a/v2/internal/frontend/assetserver/testdata/main.js b/v2/pkg/assetserver/testdata/main.js similarity index 100% rename from v2/internal/frontend/assetserver/testdata/main.js rename to v2/pkg/assetserver/testdata/main.js diff --git a/v2/internal/frontend/assetserver/testdata/subdir/index.html b/v2/pkg/assetserver/testdata/subdir/index.html similarity index 100% rename from v2/internal/frontend/assetserver/testdata/subdir/index.html rename to v2/pkg/assetserver/testdata/subdir/index.html diff --git a/v2/internal/frontend/assetserver/testdata/subdir/main.css b/v2/pkg/assetserver/testdata/subdir/main.css similarity index 100% rename from v2/internal/frontend/assetserver/testdata/subdir/main.css rename to v2/pkg/assetserver/testdata/subdir/main.css diff --git a/v2/internal/frontend/assetserver/testdata/subdir/main.js b/v2/pkg/assetserver/testdata/subdir/main.js similarity index 100% rename from v2/internal/frontend/assetserver/testdata/subdir/main.js rename to v2/pkg/assetserver/testdata/subdir/main.js diff --git a/v2/internal/frontend/assetserver/testdata/testdata.go b/v2/pkg/assetserver/testdata/testdata.go similarity index 100% rename from v2/internal/frontend/assetserver/testdata/testdata.go rename to v2/pkg/assetserver/testdata/testdata.go