[pull] main from garethgeorge:main

.github/dependabot.yml

@@ -0,0 +1,92 @@
+version: 2
+updates:
+  - package-ecosystem: gomod
+    directory: /
+    schedule:
+      interval: weekly
+      day: monday
+    open-pull-requests-limit: 10
+    groups:
+      golang-x:
+        patterns:
+          - "golang.org/x/*"
+      google-apis:
+        patterns:
+          - "google.golang.org/*"
+      prometheus:
+        patterns:
+          - "github.com/prometheus/*"
+      opentelemetry:
+        patterns:
+          - "go.opentelemetry.io/*"
+      go-minor-and-patch:
+        update-types:
+          - minor
+          - patch
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+      day: monday
+    groups:
+      actions:
+        patterns:
+          - "*"
+
+  - package-ecosystem: npm
+    directory: /webui
+    schedule:
+      interval: weekly
+      day: monday
+    open-pull-requests-limit: 10
+    groups:
+      react:
+        patterns:
+          - "react"
+          - "react-dom"
+          - "@types/react"
+          - "@types/react-dom"
+          - "react-router*"
+      connectrpc:
+        patterns:
+          - "@connectrpc/*"
+          - "@bufbuild/*"
+      chakra:
+        patterns:
+          - "@chakra-ui/*"
+          - "@emotion/*"
+      dnd-kit:
+        patterns:
+          - "@dnd-kit/*"
+      inlang:
+        patterns:
+          - "@inlang/*"
+          - "@lix-js/*"
+      dev-dependencies:
+        dependency-type: development
+      prod-minor-patch:
+        dependency-type: production
+        update-types:
+          - minor
+          - patch
+
+  - package-ecosystem: npm
+    directory: /docs
+    schedule:
+      interval: weekly
+      day: monday
+    groups:
+      docs:
+        patterns:
+          - "*"
+
+  - package-ecosystem: docker
+    directory: /
+    schedule:
+      interval: weekly
+      day: monday
+    groups:
+      docker:
+        patterns:
+          - "*"

.github/workflows/docs.yml

@@ -8,6 +8,10 @@ on:
     branches: ["main"]
     paths:
       - "docs/**"
+  pull_request:
+    paths:
+      - "docs/**"
+      - ".github/workflows/docs.yml"
   workflow_dispatch:
 
 jobs:
@@ -21,23 +25,21 @@ jobs:
           lfs: true
 
       - name: Set up NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "20"
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 9
+          cache: npm
+          cache-dependency-path: docs/package-lock.json
 
       - name: Install dependencies
-        run: pnpm install --prefix ./docs
+        run: npm ci
+        working-directory: docs
 
       - name: Build
         run: |
-          cd docs
-          pnpm run docs:build
+          npm run docs:build
           ls -la src/.vitepress/dist
+        working-directory: docs
 
       - name: Fix permissions
         run: |
@@ -52,6 +54,7 @@ jobs:
           path: docs/src/.vitepress/dist
 
   deploy:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

.gitignore

@@ -3,13 +3,15 @@ result
 
 /backrest
 /backrest-*
-dist
+dist/*
+!webui/dist/.gitkeep
 __debug_bin
 cmd/backrest/backrest
 *.exe
 .DS_Store
 .idea/
 .pnpm-store/
+package-lock.json
 .gemini
 .claude
 webui/dist-backup/

cmd/backrest/backrest.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"path"
 	"path/filepath"
 	"runtime"
 	"sync"
@@ -103,7 +102,7 @@ func runApp() {
 		zap.L().Fatal("error creating orchestrator", zap.Error(err))
 	}
 
-	kvdbPath := path.Join(env.DataDir(), "kvdb.sqlite")
+	kvdbPath := filepath.Join(env.DataDir(), "kvdb.sqlite")
 	sharedKvdb, err := kvstore.NewSqliteDbForKvStore(kvdbPath)
 	if err != nil {
 		zap.L().Fatal("error creating general kvstore database pool", zap.Error(err))
@@ -150,7 +149,7 @@ func createConfigStore() config.ConfigStore {
 }
 
 func newOpLog(cfg *v1.Config) (*oplog.OpLog, *sqlitestore.SqliteStore, error) {
-	oplogFile := path.Join(env.DataDir(), "oplog.sqlite")
+	oplogFile := filepath.Join(env.DataDir(), "oplog.sqlite")
 	opstore, err := sqlitestore.NewSqliteStore(oplogFile)
 	if errors.Is(err, sqlitestore.ErrLocked) {
 		zap.L().Fatal("oplog is locked by another instance of backrest", zap.String("data_dir", env.DataDir()))
@@ -197,7 +196,7 @@ func newLogStore(opLog *oplog.OpLog) (*logstore.LogStore, func(), error) {
 }
 
 func newAuthenticator(configMgr *config.ConfigManager) *auth.Authenticator {
-	secretFile := path.Join(env.DataDir(), "jwt-secret")
+	secretFile := filepath.Join(env.DataDir(), "jwt-secret")
 	data, err := os.ReadFile(secretFile)
 	if err != nil {
 		zap.L().Info("generating new auth secret")