From 324a2e6fe08369ddccad817cac3d002b946fb97b Mon Sep 17 00:00:00 2001 From: Alex Dunmow Date: Tue, 7 Jul 2026 11:03:57 +0800 Subject: [PATCH] chore: migrate from block/core to block/pluginsdk (keep core for captcha) Rewrite imports for plugin, blocks, templates, auth, settings, crypto, and rbac packages from git.dev.alexdunmow.com/block/core/* to git.dev.alexdunmow.com/block/pluginsdk/* across all Go files. The captcha package stays on block/core, so the repo keeps both requires. go.mod: add pluginsdk v0.1.0; bump core v0.20.2 -> v0.20.3 (satisfies the check-safety core-version gate); transitive churn pgx v5.9.2 -> v5.10.0 and x/mod v0.34.0 -> v0.37.0 from go mod tidy. Co-Authored-By: Claude Fable 5 --- block.go | 4 ++-- go.mod | 7 ++++--- go.sum | 14 ++++++++------ handler.go | 6 +++--- handler_integration_test.go | 2 +- main.go | 2 +- register.go | 6 +++--- registration.go | 6 +++--- settings_store.go | 4 ++-- 9 files changed, 27 insertions(+), 24 deletions(-) diff --git a/block.go b/block.go index b80f8e4..e802af5 100644 --- a/block.go +++ b/block.go @@ -5,8 +5,8 @@ import ( "context" "time" - "git.dev.alexdunmow.com/block/core/blocks" - "git.dev.alexdunmow.com/block/core/settings" + "git.dev.alexdunmow.com/block/pluginsdk/blocks" + "git.dev.alexdunmow.com/block/pluginsdk/settings" ) // renderSettings is the SettingsManager available to CalcomBookingFunc, which diff --git a/go.mod b/go.mod index 2af164c..d6707b8 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,12 @@ module git.dev.alexdunmow.com/block/calcomblock go 1.26.4 require ( - git.dev.alexdunmow.com/block/core v0.20.2 + git.dev.alexdunmow.com/block/core v0.20.3 + git.dev.alexdunmow.com/block/pluginsdk v0.1.0 github.com/a-h/templ v0.3.1020 github.com/go-chi/chi/v5 v5.3.0 github.com/google/uuid v1.6.0 - github.com/jackc/pgx/v5 v5.9.2 + github.com/jackc/pgx/v5 v5.10.0 github.com/nyaruka/phonenumbers v1.8.0 ) @@ -16,7 +17,7 @@ require ( github.com/BurntSushi/toml v1.6.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - golang.org/x/mod v0.34.0 // indirect + golang.org/x/mod v0.37.0 // indirect golang.org/x/text v0.36.0 // indirect google.golang.org/protobuf v1.36.11 // indirect ) diff --git a/go.sum b/go.sum index eb0c74f..0a56d49 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,9 @@ connectrpc.com/connect v1.20.0 h1:6TNDAB+WeNd2uolWNlYczB5E0KNNaVMNUEx8JEUsPmQ= connectrpc.com/connect v1.20.0/go.mod h1:A2ygJrukXwWy32vkCAAHNVguZrqZ+jeZ9rGRnGR4dN4= -git.dev.alexdunmow.com/block/core v0.20.2 h1:OVh5J7sYsjMDq6UBUpm/6FoUcfeuTr+YUPp0rQiYDuo= -git.dev.alexdunmow.com/block/core v0.20.2/go.mod h1:n/0y+8g/zabjwRNseNjme3w5J8thKqdjkIE9YJCzGow= +git.dev.alexdunmow.com/block/core v0.20.3 h1:esa09ctNGtXZgGWLER0EKPJybRf+0aoKqBOJDUfEeV4= +git.dev.alexdunmow.com/block/core v0.20.3/go.mod h1:G3MNnwiM4i9roLamhs9DAlVO2mXiYAlTRQoHPpw1AmI= +git.dev.alexdunmow.com/block/pluginsdk v0.1.0 h1:Dgbt8Q5b+1o3HdftQ7yhV2byWI5q3exiN9oXhwz2MjM= +git.dev.alexdunmow.com/block/pluginsdk v0.1.0/go.mod h1:uz6oRurbuHdTcUxg47ymVgBqRARKlpXp1JIziXevzms= github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/a-h/templ v0.3.1020 h1:ypAT/L5ySWEnZ6Zft/5yfoWXYYkhFNvEFOeeqecg4tw= @@ -19,8 +21,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw= -github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= +github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0= +github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/nyaruka/phonenumbers v1.8.0 h1:TrXNJmbwcAHajzDqin3mLWw57vqLUA6ZjVdeNds0heQ= @@ -34,8 +36,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tetratelabs/wazero v1.12.0 h1:DuWcpNu/FzgEXgGBDp8J1Spc+CWOvvtvVyjKlaZopYU= github.com/tetratelabs/wazero v1.12.0/go.mod h1:LvKtzl2RqO4gyF27BiXU+nKAjcV8f38U+kP/q2vgxh0= -golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI= -golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= diff --git a/handler.go b/handler.go index b4a93d5..288cd12 100644 --- a/handler.go +++ b/handler.go @@ -15,10 +15,10 @@ import ( "sync" "time" - "git.dev.alexdunmow.com/block/core/auth" + "git.dev.alexdunmow.com/block/pluginsdk/auth" "git.dev.alexdunmow.com/block/core/captcha" - "git.dev.alexdunmow.com/block/core/plugin" - "git.dev.alexdunmow.com/block/core/rbac" + "git.dev.alexdunmow.com/block/pluginsdk/plugin" + "git.dev.alexdunmow.com/block/pluginsdk/rbac" "git.dev.alexdunmow.com/block/calcomblock/internal/helpers" "github.com/go-chi/chi/v5" "github.com/nyaruka/phonenumbers" diff --git a/handler_integration_test.go b/handler_integration_test.go index 808fefd..ca2414a 100644 --- a/handler_integration_test.go +++ b/handler_integration_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "git.dev.alexdunmow.com/block/core/auth" + "git.dev.alexdunmow.com/block/pluginsdk/auth" "github.com/go-chi/chi/v5" "github.com/google/uuid" ) diff --git a/main.go b/main.go index c27c31c..2e9ec11 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ // init (hence wasmguest.Serve) before any ABI hook call. main is never called. package main -import "git.dev.alexdunmow.com/block/core/plugin/wasmguest" +import "git.dev.alexdunmow.com/block/pluginsdk/plugin/wasmguest" func init() { wasmguest.Serve(Registration) } diff --git a/register.go b/register.go index d0fa262..406c27d 100644 --- a/register.go +++ b/register.go @@ -5,9 +5,9 @@ import ( "io/fs" "net/http" - "git.dev.alexdunmow.com/block/core/blocks" - "git.dev.alexdunmow.com/block/core/plugin" - "git.dev.alexdunmow.com/block/core/templates" + "git.dev.alexdunmow.com/block/pluginsdk/blocks" + "git.dev.alexdunmow.com/block/pluginsdk/plugin" + "git.dev.alexdunmow.com/block/pluginsdk/templates" ) //go:embed all:web/dist/assets diff --git a/registration.go b/registration.go index 990321e..79276e9 100644 --- a/registration.go +++ b/registration.go @@ -4,9 +4,9 @@ import ( "io/fs" "net/http" - "git.dev.alexdunmow.com/block/core/blocks" - "git.dev.alexdunmow.com/block/core/plugin" - "git.dev.alexdunmow.com/block/core/templates" + "git.dev.alexdunmow.com/block/pluginsdk/blocks" + "git.dev.alexdunmow.com/block/pluginsdk/plugin" + "git.dev.alexdunmow.com/block/pluginsdk/templates" ) // Registration is the compile-time plugin registration for the Cal.com Booking block. diff --git a/settings_store.go b/settings_store.go index dee7540..dbd4975 100644 --- a/settings_store.go +++ b/settings_store.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "git.dev.alexdunmow.com/block/core/crypto" - "git.dev.alexdunmow.com/block/core/settings" + "git.dev.alexdunmow.com/block/pluginsdk/crypto" + "git.dev.alexdunmow.com/block/pluginsdk/settings" "git.dev.alexdunmow.com/block/calcomblock/internal/db" "git.dev.alexdunmow.com/block/calcomblock/internal/helpers"