From 92c5e86689bbffd3dc496036fbd400db408becd7 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 6 Dec 2024 12:20:00 +0200
Subject: [PATCH] web: update react-spinners and stop using --legacy-peer-deps

---
 .github/workflows/js.yml |  2 +-
 .gitlab-ci.yml           |  2 +-
 desktop/Taskfile.yml     |  3 +--
 web/frontend.go          |  2 +-
 web/package-lock.json    | 12 ++++++------
 web/package.json         |  2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 0adef40..476f7b7 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install dependencies
-        run: npm ci --include=dev --legacy-peer-deps
+        run: npm ci --include=dev
 
       - name: Run ESLint
         run: npm run lint
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c95356f..64f83b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ frontend:
     - web/node_modules
   script:
   - cd web
-  - npm install --legacy-peer-deps --include=dev
+  - npm install --include=dev
   - npm run build
   artifacts:
     paths:
diff --git a/desktop/Taskfile.yml b/desktop/Taskfile.yml
index a4169f9..b455132 100644
--- a/desktop/Taskfile.yml
+++ b/desktop/Taskfile.yml
@@ -370,8 +370,7 @@ tasks:
       - sh: npm version
         msg: "Looks like npm isn't installed. Npm is part of the Node installer: https://nodejs.org/en/download/"
     cmds:
-      # - npm install --silent --no-progress
-      - npm install --legacy-peer-deps
+      - npm install --silent --no-progress
 
   build:frontend:
     summary: Build the frontend project
diff --git a/web/frontend.go b/web/frontend.go
index 3ef52d8..6e8f500 100644
--- a/web/frontend.go
+++ b/web/frontend.go
@@ -20,7 +20,7 @@ import (
 	"embed"
 )
 
-//go:generate npm install --legacy-peer-deps
+//go:generate npm install
 //go:generate npm run build
 //go:embed dist
 var Frontend embed.FS
diff --git a/web/package-lock.json b/web/package-lock.json
index 6b9fac3..4644b47 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -17,7 +17,7 @@
 				"react": "^19.0.0",
 				"react-blurhash": "^0.3.0",
 				"react-dom": "^19.0.0",
-				"react-spinners": "^0.14.1",
+				"react-spinners": "^0.15.0",
 				"unhomoglyph": "^1.0.6"
 			},
 			"devDependencies": {
@@ -4722,13 +4722,13 @@
 			}
 		},
 		"node_modules/react-spinners": {
-			"version": "0.14.1",
-			"resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.14.1.tgz",
-			"integrity": "sha512-2Izq+qgQ08HTofCVEdcAQCXFEYfqTDdfeDQJeo/HHQiQJD4imOicNLhkfN2eh1NYEWVOX4D9ok2lhuDB0z3Aag==",
+			"version": "0.15.0",
+			"resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.15.0.tgz",
+			"integrity": "sha512-ZO3/fNB9Qc+kgpG3SfdlMnvTX6LtLmTnOogb3W6sXIaU/kZ1ydEViPfZ06kSOaEsor58C/tzXw2wROGQu3X2pA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
-				"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
+				"react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+				"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
 		"node_modules/reflect.getprototypeof": {
diff --git a/web/package.json b/web/package.json
index 2f2a78e..0d135f1 100644
--- a/web/package.json
+++ b/web/package.json
@@ -19,7 +19,7 @@
 		"react": "^19.0.0",
 		"react-blurhash": "^0.3.0",
 		"react-dom": "^19.0.0",
-		"react-spinners": "^0.14.1",
+		"react-spinners": "^0.15.0",
 		"unhomoglyph": "^1.0.6"
 	},
 	"devDependencies": {