From 2121c2bef60cc0510a0a0985a5272a9a4e60a4d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Mar 2026 02:42:27 +0000 Subject: [PATCH] build(deps): bump github.com/markbates/pkger from 0.15.1 to 0.17.1 Bumps [github.com/markbates/pkger](https://github.com/markbates/pkger) from 0.15.1 to 0.17.1. - [Release notes](https://github.com/markbates/pkger/releases) - [Commits](https://github.com/markbates/pkger/compare/v0.15.1...v0.17.1) --- updated-dependencies: - dependency-name: github.com/markbates/pkger dependency-version: 0.17.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +- vendor/github.com/markbates/pkger/README.md | 39 ++++++++++--------- .../github.com/markbates/pkger/here/here.go | 14 +++++++ .../markbates/pkger/internal/maps/files.go | 2 +- .../markbates/pkger/internal/maps/infos.go | 2 +- vendor/github.com/markbates/pkger/pkger.go | 2 +- .../github.com/markbates/pkger/pkging/file.go | 2 +- .../markbates/pkger/pkging/pkger.go | 2 +- .../markbates/pkger/pkging/stdos/file.go | 2 +- .../markbates/pkger/pkging/stdos/stdos.go | 2 +- .../github.com/markbates/pkger/pkging/wrap.go | 2 +- vendor/modules.txt | 3 +- 13 files changed, 47 insertions(+), 31 deletions(-) create mode 100644 vendor/github.com/markbates/pkger/here/here.go diff --git a/go.mod b/go.mod index 7e337bb..555981c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/gobuffalo/here v0.6.0 github.com/google/jsonschema-go v0.4.2 github.com/jsonnet-libs/docsonnet v0.0.6 - github.com/markbates/pkger v0.15.1 + github.com/markbates/pkger v0.17.1 github.com/spf13/cobra v1.10.2 ) diff --git a/go.sum b/go.sum index 2f359f8..6b635bc 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/markbates/pkger v0.15.1 h1:3MPelV53RnGSW07izx5xGxl4e/sdRD6zqseIk0rMASY= -github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= +github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno= +github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= diff --git a/vendor/github.com/markbates/pkger/README.md b/vendor/github.com/markbates/pkger/README.md index 2730fe2..32215ea 100644 --- a/vendor/github.com/markbates/pkger/README.md +++ b/vendor/github.com/markbates/pkger/README.md @@ -24,9 +24,10 @@ Paths: * Packages can specified in at the beginning of a path with a `:` seperator. github.com/markbates/pkger:/cmd/pkger/main.go * There are no relative paths. All paths are absolute to the modules root. +* Fully-qualified paths are embedded into the metadata of your static assets. If this behavior is undesirable, a preference is to build in a containerized environ, like docker, where the path strings are not ex-filtrating data about your development environment. ``` -"github.com/gobuffalo/buffalo:/go.mod" => $GOPATH/pkg/mod/github.com/gobuffalo/buffalo@v0.14.7/go.mod +"github.com/gobuffalo/buffalo:/go.mod" => /go/pkg/mod/github.com/gobuffalo/buffalo@v0.14.7/go.mod ``` ## CLI @@ -284,26 +285,26 @@ $ pkger parse ".": [ { "file": { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz", "Path": { "Pkg": "app", "Name": "/foo/bar/baz" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", "ImportPath": "app", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "main" } }, "pos": { - "Filename": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", + "Filename": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", "Offset": 629, "Line": 47, "Column": 27 @@ -313,26 +314,26 @@ $ pkger parse }, { "file": { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz/biz.txt", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz/biz.txt", "Path": { "Pkg": "app", "Name": "/foo/bar/baz/biz.txt" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", "ImportPath": "app", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "main" } }, "pos": { - "Filename": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", + "Filename": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go", "Offset": 706, "Line": 51, "Column": 25 @@ -388,38 +389,38 @@ $ pkger list -json "ImportPath": "app", "Files": [ { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", "Path": { "Pkg": "app", "Name": "/assets" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", "ImportPath": "", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "assets" } }, { - "Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets/css", + "Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets/css", "Path": { "Pkg": "app", "Name": "/assets/css" }, "Here": { - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets", "ImportPath": "", "Module": { "Path": "app", "Main": true, - "Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", - "GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", + "Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref", + "GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod", "GoVersion": "1.13" }, "Name": "assets" diff --git a/vendor/github.com/markbates/pkger/here/here.go b/vendor/github.com/markbates/pkger/here/here.go new file mode 100644 index 0000000..f87a061 --- /dev/null +++ b/vendor/github.com/markbates/pkger/here/here.go @@ -0,0 +1,14 @@ +package here + +import ( + "github.com/gobuffalo/here" +) + +type Info = here.Info +type Module = here.Module +type Path = here.Path + +var Here = here.New() +var Dir = Here.Dir +var Package = Here.Package +var Current = Here.Current diff --git a/vendor/github.com/markbates/pkger/internal/maps/files.go b/vendor/github.com/markbates/pkger/internal/maps/files.go index fd32fff..3b3b6ac 100644 --- a/vendor/github.com/markbates/pkger/internal/maps/files.go +++ b/vendor/github.com/markbates/pkger/internal/maps/files.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/vendor/github.com/markbates/pkger/internal/maps/infos.go b/vendor/github.com/markbates/pkger/internal/maps/infos.go index cfc0604..0eed02f 100644 --- a/vendor/github.com/markbates/pkger/internal/maps/infos.go +++ b/vendor/github.com/markbates/pkger/internal/maps/infos.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) // Infos wraps sync.Map and uses the following types: diff --git a/vendor/github.com/markbates/pkger/pkger.go b/vendor/github.com/markbates/pkger/pkger.go index 96d1c32..5f56a51 100644 --- a/vendor/github.com/markbates/pkger/pkger.go +++ b/vendor/github.com/markbates/pkger/pkger.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" "github.com/markbates/pkger/pkging/stdos" ) diff --git a/vendor/github.com/markbates/pkger/pkging/file.go b/vendor/github.com/markbates/pkger/pkging/file.go index 6d49cca..c7d12a1 100644 --- a/vendor/github.com/markbates/pkger/pkging/file.go +++ b/vendor/github.com/markbates/pkger/pkging/file.go @@ -4,7 +4,7 @@ import ( "net/http" "os" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type File interface { diff --git a/vendor/github.com/markbates/pkger/pkging/pkger.go b/vendor/github.com/markbates/pkger/pkging/pkger.go index 4a7a2fa..b2076f6 100644 --- a/vendor/github.com/markbates/pkger/pkging/pkger.go +++ b/vendor/github.com/markbates/pkger/pkging/pkger.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type Pkger interface { diff --git a/vendor/github.com/markbates/pkger/pkging/stdos/file.go b/vendor/github.com/markbates/pkger/pkging/stdos/file.go index 51559f8..35845cf 100644 --- a/vendor/github.com/markbates/pkger/pkging/stdos/file.go +++ b/vendor/github.com/markbates/pkger/pkging/stdos/file.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go b/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go index 30481ea..b811702 100644 --- a/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go +++ b/vendor/github.com/markbates/pkger/pkging/stdos/stdos.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/internal/maps" "github.com/markbates/pkger/pkging" ) diff --git a/vendor/github.com/markbates/pkger/pkging/wrap.go b/vendor/github.com/markbates/pkger/pkging/wrap.go index dee4b0a..438f955 100644 --- a/vendor/github.com/markbates/pkger/pkging/wrap.go +++ b/vendor/github.com/markbates/pkger/pkging/wrap.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) func Wrap(parent, with Pkger) Pkger { diff --git a/vendor/modules.txt b/vendor/modules.txt index fda199c..313572d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -23,9 +23,10 @@ github.com/inconshreveable/mousetrap # github.com/jsonnet-libs/docsonnet v0.0.6 => github.com/squat/docsonnet v0.0.0-20260323023749-7f0aee931ffa ## explicit; go 1.23.7 github.com/jsonnet-libs/docsonnet/pkg/docsonnet -# github.com/markbates/pkger v0.15.1 +# github.com/markbates/pkger v0.17.1 ## explicit; go 1.13 github.com/markbates/pkger +github.com/markbates/pkger/here github.com/markbates/pkger/internal/maps github.com/markbates/pkger/pkging github.com/markbates/pkger/pkging/stdos