Merge pull request #374 from synyx/dependency-upgrades

Dependency upgrades

.editorconfig

@@ -8,9 +8,11 @@ root = true
 end_of_line = lf
 
 [*.js]
+indent_style = space
+indent_size = 2
 charset = utf-8
 max_line_length = 80
 
-[*.{js,css,json}]
+[*.{css,json}]
 indent_style = space
 indent_size = 2

.github/dependabot.yml

@@ -22,4 +22,4 @@ updates:
       interval: "monthly"
     labels:
       - "dependencies"
-      - "github_actions"
+      - "github_actions"

.github/workflows/ci.yml

@@ -14,10 +14,10 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '^1.14.3'
+        go-version-file: 'go.mod'
 
     - name: Cache node modules
-      uses: actions/cache@v3.3.2
+      uses: actions/cache@v4
       env:
         cache-name: cache-node-modules
       with:
@@ -47,10 +47,10 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '^1.14.3'
+        go-version-file: 'go.mod'
 
     - name: Cache node modules
-      uses: actions/cache@v3.3.2
+      uses: actions/cache@v4
       env:
         cache-name: cache-node-modules
       with:

.github/workflows/publish.yml

@@ -32,10 +32,10 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '^1.14.3'
+        go-version-file: 'go.mod'
 
     - name: Cache node modules
-      uses: actions/cache@v3.3.2
+      uses: actions/cache@v4
       env:
         cache-name: cache-node-modules
       with:
@@ -72,15 +72,15 @@ jobs:
     - run: make dist
 
     - name: Upload server binaries to release
-      uses: svenstaro/upload-release-action@2.7.0
+      uses: svenstaro/upload-release-action@2.9.0
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: ${{ matrix.server_artifact_name }}
         asset_name: ${{ matrix.server_asset_name }}
         tag: ${{ github.ref }}
 
     - name: Upload desktop binaries to release
-      uses: svenstaro/upload-release-action@2.7.0
+      uses: svenstaro/upload-release-action@2.9.0
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: ${{ matrix.desktop_artifact_name }}

.golangci.yml

@@ -0,0 +1,5 @@
+issues:
+  exclude-rules:
+    - path: (.+)_test.go
+      linters:
+        - errcheck

Makefile

@@ -65,7 +65,8 @@ lint: lint-go lint-js
 
 lint-go:
 	go vet ./...
-	golint -set_exit_status ./...
+	which golint && golint -set_exit_status ./... || true
+	which golangci-lint && golangci-lint run || true
 
 lint-js:
 	npm run lint

cmd/tales-migrate/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -28,7 +27,7 @@ func main() {
 	total := 0
 	success := 0
 
-	files, err := ioutil.ReadDir(projectDir)
+	files, err := os.ReadDir(projectDir)
 	if err != nil {
 		log.Fatalf("Failed to open project directory: %v", err)
 	}
@@ -63,7 +62,7 @@ func migrate(slug, ednFile, jsonFile string) error {
 	var err error
 	var data []byte
 
-	data, err = ioutil.ReadFile(ednFile)
+	data, err = os.ReadFile(ednFile)
 	if err != nil {
 		return err
 	}
@@ -79,7 +78,7 @@ func migrate(slug, ednFile, jsonFile string) error {
 		return err
 	}
 
-	return ioutil.WriteFile(jsonFile, data, 0644)
+	return os.WriteFile(jsonFile, data, 0644)
 
 }
 

cmd/tales-server/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"log"
 	"net/http"
@@ -62,7 +63,7 @@ func main() {
 	}
 
 	go func() {
-		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		if err := server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			log.Fatalf("Failed to listen: %s", err)
 		}
 	}()

eslint.config.mjs

@@ -0,0 +1,50 @@
+import jest from "eslint-plugin-jest";
+import prettier from "eslint-plugin-prettier";
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [...compat.extends(
+    "eslint:recommended",
+    "plugin:jest/recommended",
+    "plugin:prettier/recommended",
+), {
+    plugins: {
+        jest,
+        prettier,
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.jest,
+            process: true,
+        },
+
+        ecmaVersion: 2018,
+        sourceType: "module",
+    },
+
+    rules: {
+        "max-len": ["error", 80],
+
+        "no-console": ["error", {
+            allow: ["warn", "error"],
+        }],
+
+        "no-unused-vars": ["error", {
+            argsIgnorePattern: "^_",
+            varsIgnorePattern: "^_",
+        }],
+    },
+}];

go.mod

@@ -1,11 +1,17 @@
 module synyx.de/tales
 
-go 1.14
+go 1.22
 
 require (
 	github.com/gorilla/mux v1.8.1
 	github.com/mozillazg/go-slugify v0.2.0
-	github.com/mozillazg/go-unidecode v0.1.1 // indirect
-	github.com/stretchr/testify v1.8.4
-	olympos.io/encoding/edn v0.0.0-20200308123125-93e3b8dd0e24
+	github.com/stretchr/testify v1.9.0
+	olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/mozillazg/go-unidecode v0.2.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,25 +1,18 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/mozillazg/go-slugify v0.2.0 h1:SIhqDlnJWZH8OdiTmQgeXR28AOnypmAXPeOTcG7b9lk=
 github.com/mozillazg/go-slugify v0.2.0/go.mod h1:z7dPH74PZf2ZPFkyxx+zjPD8CNzRJNa1CGacv0gg8Ns=
-github.com/mozillazg/go-unidecode v0.1.1 h1:uiRy1s4TUqLbcROUrnCN/V85Jlli2AmDF6EeAXOeMHE=
-github.com/mozillazg/go-unidecode v0.1.1/go.mod h1:fYMdhyjni9ZeEmS6OE/GJHDLsF8TQvIVDwYR/drR26Q=
+github.com/mozillazg/go-unidecode v0.2.0 h1:vFGEzAH9KSwyWmXCOblazEWDh7fOkpmy/Z4ArmamSUc=
+github.com/mozillazg/go-unidecode v0.2.0/go.mod h1:zB48+/Z5toiRolOZy9ksLryJ976VIwmDmpQ2quyt1aA=
 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-olympos.io/encoding/edn v0.0.0-20200308123125-93e3b8dd0e24 h1:sreVOrDp0/ezb0CHKVek/l7YwpxPJqv+jT3izfSphA4=
-olympos.io/encoding/edn v0.0.0-20200308123125-93e3b8dd0e24/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw=
+olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 h1:slmdOY3vp8a7KQbHkL+FLbvbkgMqmXojpFUO/jENuqQ=
+olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw=