Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
name: Go lint
runs-on: ubuntu-latest
env:
GOLANGCI_LINT_VERSION: v2.5.0
GOLANGCI_LINT_VERSION: v2.7.2
GOPROXY: https://proxy.golang.org,https://u:${{ secrets.RIVERPRO_GO_MOD_CREDENTIAL }}@riverqueue.com/goproxy,direct
permissions:
contents: read
Expand Down
6 changes: 3 additions & 3 deletions handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ func (h *Handler) Start(ctx context.Context) error {
return nil
}

func readManifest(frontendIndex fs.FS, devMode bool) (map[string]interface{}, error) {
func readManifest(frontendIndex fs.FS, devMode bool) (map[string]any, error) {
if devMode {
return map[string]interface{}{}, nil
return map[string]any{}, nil
}

file, err := frontendIndex.Open(".vite/manifest.json")
Expand All @@ -326,7 +326,7 @@ func readManifest(frontendIndex fs.FS, devMode bool) (map[string]interface{}, er
if err != nil {
return nil, errors.New("could not read .vite/manifest.json")
}
var manifest map[string]interface{}
var manifest map[string]any
err = json.Unmarshal(bytes, &manifest)
if err != nil {
return nil, errors.New("could not unmarshal .vite/manifest.json")
Expand Down
2 changes: 1 addition & 1 deletion handler_api_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ func (a *queueUpdateEndpoint[TTx]) Execute(ctx context.Context, req *queueUpdate
slices.Sort(req.Concurrency.Value.Partition.ByArgs)

// Otherwise, construct metadata with the concurrency config
metadataStruct := map[string]interface{}{
metadataStruct := map[string]any{
"concurrency": req.Concurrency.Value,
}
var err error
Expand Down
6 changes: 3 additions & 3 deletions spa_response_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func intercept404(handler, on404 http.Handler) http.Handler {
})
}

func serveIndexHTML(devMode bool, manifest map[string]interface{}, pathPrefix string, files http.FileSystem) http.HandlerFunc {
func serveIndexHTML(devMode bool, manifest map[string]any, pathPrefix string, files http.FileSystem) http.HandlerFunc {
return func(rw http.ResponseWriter, req *http.Request) {
// Restrict only to instances where the browser is looking for an HTML file
if !strings.Contains(req.Header.Get("Accept"), "text/html") {
Expand All @@ -51,7 +51,7 @@ func serveIndexHTML(devMode bool, manifest map[string]interface{}, pathPrefix st
Base: pathPrefix,
}

templateData := map[string]interface{}{
templateData := map[string]any{
"Config": config,
"Dev": devMode,
"Manifest": manifest,
Expand All @@ -71,7 +71,7 @@ func serveIndexHTML(devMode bool, manifest map[string]interface{}, pathPrefix st
}

tmpl, err := template.New("index.html").Funcs(template.FuncMap{
"marshal": func(v interface{}) template.JS {
"marshal": func(v any) template.JS {
a, _ := json.Marshal(v)
return template.JS(a) //nolint:gosec
},
Expand Down
Loading