diff --git a/go.mod b/go.mod index 556c530..c0b5147 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,8 @@ go 1.25 toolchain go1.25.0 +replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 + require ( github.com/aws/aws-sdk-go v1.55.8 github.com/aws/aws-sdk-go-v2 v1.39.2 @@ -28,7 +30,7 @@ require ( github.com/hashicorp/go-uuid v1.0.3 github.com/hashicorp/go-version v1.7.0 github.com/jlaffaye/ftp v0.2.0 - github.com/matcornic/hermes/v2 v2.1.0 + github.com/matcornic/hermes v1.3.0 github.com/mattn/go-colorable v0.1.14 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/mapstructure v1.5.0 @@ -65,17 +67,18 @@ require ( ) require ( + dario.cat/mergo v1.0.1 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/semver/v3 v3.4.0 // indirect github.com/Masterminds/sprig v2.22.0+incompatible // indirect - github.com/PuerkitoBio/goquery v1.10.3 // indirect + github.com/PuerkitoBio/goquery v1.10.2 // indirect github.com/VividCortex/ewma v1.2.0 // indirect github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect github.com/andybalholm/cascadia v1.3.3 // indirect - github.com/antithesishq/antithesis-sdk-go v0.5.0 // indirect + github.com/antithesishq/antithesis-sdk-go v0.4.3-default-no-op // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect @@ -90,11 +93,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bytedance/gopkg v0.1.3 // indirect - github.com/bytedance/sonic v1.14.1 // indirect + github.com/bytedance/sonic v1.14.0 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/clipperhouse/uax29/v2 v2.2.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect github.com/gabriel-vasile/mimetype v1.4.10 // indirect github.com/gin-contrib/sse v1.1.0 // indirect @@ -103,27 +104,27 @@ require ( github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-sql-driver/mysql v1.9.3 // indirect + github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect - github.com/goccy/go-json v0.10.5 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/goccy/go-yaml v1.18.0 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/go-tpm v0.9.6 // indirect - github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d // indirect + github.com/google/go-tpm v0.9.5 // indirect + github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/css v1.0.1 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/huandu/xstrings v1.5.0 // indirect - github.com/imdario/mergo v0.3.16 // indirect + github.com/imdario/mergo v0.0.0-00010101000000-000000000000 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgx/v5 v5.7.6 // indirect + github.com/jackc/pgx/v5 v5.6.0 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 // indirect github.com/jinzhu/inflection v1.0.0 // indirect @@ -134,10 +135,10 @@ require ( github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-runewidth v0.0.19 // indirect - github.com/mattn/go-sqlite3 v1.14.32 // indirect - github.com/mattn/go-tty v0.0.7 // indirect - github.com/microsoft/go-mssqldb v1.9.3 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/mattn/go-tty v0.0.3 // indirect + github.com/microsoft/go-mssqldb v1.8.2 // indirect github.com/minio/highwayhash v1.0.3 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect @@ -146,19 +147,17 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nats-io/nkeys v0.4.11 // indirect github.com/nats-io/nuid v1.0.1 // indirect - github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect - github.com/olekukonko/errors v1.1.0 // indirect - github.com/olekukonko/ll v0.1.1 // indirect - github.com/olekukonko/tablewriter v1.1.0 // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pkg/term v1.2.0-beta.2 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.66.1 // indirect github.com/prometheus/procfs v0.16.1 // indirect github.com/quic-go/qpack v0.5.1 // indirect - github.com/quic-go/quic-go v0.55.0 // indirect + github.com/quic-go/quic-go v0.54.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/sagikazarmark/locafero v0.12.0 // indirect + github.com/sagikazarmark/locafero v0.11.0 // indirect + github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.10.0 // indirect github.com/spf13/pflag v1.0.10 // indirect @@ -166,18 +165,18 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/vanng822/css v1.0.1 // indirect - github.com/vanng822/go-premailer v1.25.0 // indirect + github.com/vanng822/go-premailer v1.24.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/automaxprocs v1.6.0 // indirect - go.uber.org/mock v0.6.0 // indirect + go.uber.org/mock v0.5.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/arch v0.22.0 // indirect + golang.org/x/arch v0.20.0 // indirect golang.org/x/crypto v0.43.0 // indirect - golang.org/x/mod v0.29.0 // indirect + golang.org/x/mod v0.28.0 // indirect golang.org/x/text v0.30.0 // indirect - golang.org/x/time v0.14.0 // indirect - golang.org/x/tools v0.38.0 // indirect - google.golang.org/protobuf v1.36.10 // indirect + golang.org/x/time v0.13.0 // indirect + golang.org/x/tools v0.37.0 // indirect + google.golang.org/protobuf v1.36.9 // indirect ) diff --git a/mailer/README.md b/mailer/README.md index 8dbad75..f3bc3e7 100644 --- a/mailer/README.md +++ b/mailer/README.md @@ -59,7 +59,7 @@ A configuration struct for easy mapping from config files or environment variabl ```go import ( "github.com/nabbar/golib/mailer" - "github.com/matcornic/hermes/v2" + "github.com/matcornic/hermes" ) m := mailer.New() diff --git a/mailer/config.go b/mailer/config.go index 565fe3e..e0ceb2c 100644 --- a/mailer/config.go +++ b/mailer/config.go @@ -30,7 +30,7 @@ import ( "fmt" libval "github.com/go-playground/validator/v10" - libhms "github.com/matcornic/hermes/v2" + libhms "github.com/matcornic/hermes" liberr "github.com/nabbar/golib/errors" ) diff --git a/mailer/direction.go b/mailer/direction.go index e5a2698..f36971f 100644 --- a/mailer/direction.go +++ b/mailer/direction.go @@ -28,7 +28,7 @@ package mailer import ( "strings" - "github.com/matcornic/hermes/v2" + "github.com/matcornic/hermes" ) type TextDirection uint8 diff --git a/mailer/email.go b/mailer/email.go index 5391030..5308580 100644 --- a/mailer/email.go +++ b/mailer/email.go @@ -25,7 +25,7 @@ package mailer -import "github.com/matcornic/hermes/v2" +import "github.com/matcornic/hermes" type email struct { p hermes.Product diff --git a/mailer/interface.go b/mailer/interface.go index 4b25e8c..7aef068 100644 --- a/mailer/interface.go +++ b/mailer/interface.go @@ -28,7 +28,7 @@ package mailer import ( "bytes" - "github.com/matcornic/hermes/v2" + "github.com/matcornic/hermes" liberr "github.com/nabbar/golib/errors" ) diff --git a/mailer/render.go b/mailer/render.go index 82382ed..2eb01cf 100644 --- a/mailer/render.go +++ b/mailer/render.go @@ -29,7 +29,7 @@ import ( "bytes" "strings" - "github.com/matcornic/hermes/v2" + "github.com/matcornic/hermes" liberr "github.com/nabbar/golib/errors" ) diff --git a/mailer/themes.go b/mailer/themes.go index 7f25f7f..4128ec6 100644 --- a/mailer/themes.go +++ b/mailer/themes.go @@ -28,7 +28,7 @@ package mailer import ( "strings" - "github.com/matcornic/hermes/v2" + "github.com/matcornic/hermes" ) type Themes uint8 diff --git a/test/test-mail/main.go b/test/test-mail/main.go index 6c0b1cc..4412d93 100644 --- a/test/test-mail/main.go +++ b/test/test-mail/main.go @@ -33,7 +33,7 @@ import ( "crypto/tls" "time" - "github.com/matcornic/hermes/v2" + "github.com/matcornic/hermes" liberr "github.com/nabbar/golib/errors" libiot "github.com/nabbar/golib/ioutils" liblog "github.com/nabbar/golib/logger"