diff --git a/Makefile b/Makefile
index 28d34d426..ffba78e65 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ test: ##@Development Run Go tests
.PHONY: test
testall: test ##@Development Run Go and JS tests
- @(cd ./ui && npm test -- --watchAll=false)
+ @(cd ./ui && npm run test:ci)
.PHONY: testall
lint: ##@Development Lint Go code
diff --git a/ui/.eslintignore b/ui/.eslintignore
new file mode 100644
index 000000000..971f833e3
--- /dev/null
+++ b/ui/.eslintignore
@@ -0,0 +1,5 @@
+node_modules/
+build/
+prettier.config.js
+.eslintrc
+vite.config.js
\ No newline at end of file
diff --git a/ui/.eslintrc b/ui/.eslintrc
new file mode 100644
index 000000000..bb17b134f
--- /dev/null
+++ b/ui/.eslintrc
@@ -0,0 +1,61 @@
+{
+ "env": {
+ "browser": true,
+ "node": true,
+ "es6": true
+ },
+ "extends": [
+ "eslint:recommended",
+ "plugin:react/recommended",
+ "plugin:react-hooks/recommended",
+// "plugin:jsx-a11y/recommended",
+ "eslint-config-prettier",
+ "plugin:@typescript-eslint/recommended",
+ ],
+ "parser": "@typescript-eslint/parser",
+ "parserOptions": {
+ "warnOnUnsupportedTypeScriptVersion": false
+ },
+ "settings": {
+ "react": {
+ "version": "detect"
+ },
+ "import/resolver": {
+ "node": {
+ "paths": [
+ "src"
+ ],
+ "extensions": [
+ ".js",
+ ".jsx",
+ ".ts",
+ ".tsx"
+ ]
+ }
+ }
+ },
+ "plugins": ["react-refresh"],
+ "rules": {
+ "no-console": "error",
+// "no-unused-vars": "off",
+ "@typescript-eslint/no-unused-vars": "off",
+ "react-refresh/only-export-components": [
+ "warn",
+ { "allowConstantExport": true }
+ ],
+ "react/jsx-uses-react": "off",
+ "react/react-in-jsx-scope": "off",
+ "react/prop-types": "off",
+ },
+ // Fix Vitest
+ "globals": {
+ "describe": "readonly",
+ "it": "readonly",
+ "expect": "readonly",
+ "vi": "readonly",
+ "beforeAll": "readonly",
+ "afterAll": "readonly",
+ "beforeEach": "readonly",
+ "afterEach": "readonly",
+ }
+}
\ No newline at end of file
diff --git a/ui/.gitignore b/ui/.gitignore
index bd1906e59..cc5178213 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -1,23 +1,6 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+node_modules
+.eslintcache
build/*
!build/.gitkeep
+/coverage/
diff --git a/ui/.prettierrc.js b/ui/.prettierrc.js
deleted file mode 100644
index 70cd434a4..000000000
--- a/ui/.prettierrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
- singleQuote: true,
- semi: false,
- arrowParens: 'always'
-}
diff --git a/ui/bin/update-workbox.sh b/ui/bin/update-workbox.sh
deleted file mode 100755
index ced314f71..000000000
--- a/ui/bin/update-workbox.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-export WORKBOX_DIR=public/3rdparty/workbox
-
-rm -rf ${WORKBOX_DIR}
-workbox copyLibraries build/3rdparty/
-
-mkdir -p public/3rdparty/workbox
-mv build/3rdparty/workbox-*/workbox-sw.js ${WORKBOX_DIR}
-mv build/3rdparty/workbox-*/workbox-core.prod.js ${WORKBOX_DIR}
-mv build/3rdparty/workbox-*/workbox-strategies.prod.js ${WORKBOX_DIR}
-mv build/3rdparty/workbox-*/workbox-routing.prod.js ${WORKBOX_DIR}
-mv build/3rdparty/workbox-*/workbox-navigation-preload.prod.js ${WORKBOX_DIR}
-rm -rf build/3rdparty/workbox-*
diff --git a/ui/public/index.html b/ui/index.html
similarity index 62%
rename from ui/public/index.html
rename to ui/index.html
index e11abd37c..0e60ec678 100644
--- a/ui/public/index.html
+++ b/ui/index.html
@@ -6,11 +6,11 @@
name="description"
content="Navidrome Music Server - {{.Version}}"
/>
-
-
-
-
-
+
+
+
+
+
@@ -19,16 +19,7 @@
manifest.webmanifest provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
-
-
+
@@ -57,4 +48,5 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
+