From 2097917286c2a770ababf8a37e2e495a7597b7cc Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Fri, 1 Sep 2023 15:37:03 +0200
Subject: [PATCH] Fix merge errors

---
 package.json                                   |  2 +-
 pnpm-lock.yaml                                 | 18 ++++--------------
 .../components/parts/VideoErrorBoundary.tsx    |  2 +-
 src/index.tsx                                  |  2 +-
 src/pages/developer/VideoTesterView.tsx        |  2 +-
 src/pages/parts/errors/ErrorWrapperPart.tsx    |  2 +-
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index f050ef80..7e4a7d75 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "homepage": "https://movie-web.app",
   "dependencies": {
-    "@formkit/auto-animate": "^1.0.0-beta.5",
+    "@formkit/auto-animate": "^0.7.0",
     "@headlessui/react": "^1.5.0",
     "@react-spring/web": "^9.7.1",
     "@sentry/integrations": "^7.49.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8220b96a..c1c5672f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,8 +6,8 @@ settings:
 
 dependencies:
   '@formkit/auto-animate':
-    specifier: ^1.0.0-beta.5
-    version: 1.0.0-pre-alpha.3(react@17.0.2)
+    specifier: ^0.7.0
+    version: 0.7.0
   '@headlessui/react':
     specifier: ^1.5.0
     version: 1.7.17(react-dom@17.0.2)(react@17.0.2)
@@ -1741,18 +1741,8 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@formkit/auto-animate@1.0.0-pre-alpha.3(react@17.0.2):
-    resolution: {integrity: sha512-lMVZ3LFUIu0RIxCEwmV8nUUJQ46M2bv2NDU3hrhZivViuR1EheC8Mj5sx/ACqK5QLK8XB8z7GDIZBUGdU/9OZQ==}
-    peerDependencies:
-      react: ^16.8.0
-      vue: ^3.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      vue:
-        optional: true
-    dependencies:
-      react: 17.0.2
+  /@formkit/auto-animate@0.7.0:
+    resolution: {integrity: sha512-RczHUr0AhRPssREoNdRjLfk2b/id9/DFnbIq18QM8L7E4zNV3XH+WO480EZ46BQHDEsv76YPJ0JbG2Y2i3GfXw==}
     dev: false
 
   /@headlessui/react@1.7.17(react-dom@17.0.2)(react@17.0.2):
diff --git a/src/_oldvideo/components/parts/VideoErrorBoundary.tsx b/src/_oldvideo/components/parts/VideoErrorBoundary.tsx
index 061bf2b7..bb6046ee 100644
--- a/src/_oldvideo/components/parts/VideoErrorBoundary.tsx
+++ b/src/_oldvideo/components/parts/VideoErrorBoundary.tsx
@@ -1,6 +1,6 @@
 import { Component } from "react";
+import type { ReactNode } from "react";
 import { Trans } from "react-i18next";
-import type { ReactNode } from "react-router-dom/node_modules/@types/react/index";
 
 import { MWMediaMeta } from "@/backend/metadata/types/mw";
 import { ErrorMessage } from "@/components/layout/ErrorBoundary";
diff --git a/src/index.tsx b/src/index.tsx
index 839d7a90..cdd870ab 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,8 +1,8 @@
 import "core-js/stable";
 import React, { Suspense } from "react";
+import type { ReactNode } from "react";
 import ReactDOM from "react-dom";
 import { BrowserRouter, HashRouter } from "react-router-dom";
-import type { ReactNode } from "react-router-dom/node_modules/@types/react/index";
 import { registerSW } from "virtual:pwa-register";
 
 import { ErrorBoundary } from "@/components/layout/ErrorBoundary";
diff --git a/src/pages/developer/VideoTesterView.tsx b/src/pages/developer/VideoTesterView.tsx
index c07ddc32..0141a955 100644
--- a/src/pages/developer/VideoTesterView.tsx
+++ b/src/pages/developer/VideoTesterView.tsx
@@ -2,7 +2,7 @@ import { useEffect } from "react";
 
 import { MWStreamType } from "@/backend/helpers/streams";
 import { usePlayer } from "@/components/player/hooks/usePlayer";
-import { PlayerView } from "@/views/PlayerView";
+import { PlayerView } from "@/pages/PlayerView";
 
 export default function VideoTesterView() {
   const player = usePlayer();
diff --git a/src/pages/parts/errors/ErrorWrapperPart.tsx b/src/pages/parts/errors/ErrorWrapperPart.tsx
index 2272cc9f..5b2fd9b0 100644
--- a/src/pages/parts/errors/ErrorWrapperPart.tsx
+++ b/src/pages/parts/errors/ErrorWrapperPart.tsx
@@ -2,9 +2,9 @@ import { ReactNode } from "react";
 import { Helmet } from "react-helmet";
 import { useTranslation } from "react-i18next";
 
+import { VideoPlayerHeader } from "@/_oldvideo/components/parts/VideoPlayerHeader";
 import { Navigation } from "@/components/layout/Navigation";
 import { useGoBack } from "@/hooks/useGoBack";
-import { VideoPlayerHeader } from "@/video/components/parts/VideoPlayerHeader";
 
 export function ErrorWrapperPart(props: {
   children?: ReactNode;