mirrors/movie-web
1
0
Fork 0
mirror of https://github.com/movie-web/movie-web.git synced 2024-12-29 00:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge errors

Browse source
This commit is contained in:
mrjvs 2023-09-01 15:37:03 +02:00
parent 89d5c65b18
commit 2097917286
6 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -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",

18
pnpm-lock.yaml
View file

@ -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):

2
src/_oldvideo/components/parts/VideoErrorBoundary.tsx
View file

@ -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";

2
src/index.tsx
View file

@ -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";

2
src/pages/developer/VideoTesterView.tsx
View file

@ -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();

2
src/pages/parts/errors/ErrorWrapperPart.tsx
View file

@ -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;