open-source-mirrors
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development

Browse Source
pull/2824/head v1.5.2-beta.4
morpheus65535 1 month ago
parent 58880117a9 9fc77524b2
commit 5fa64c6b87
24 changed files with 70 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
frontend/config/chunks.ts
Unescape View File

@ -3,7 +3,7 @@ import { dependencies } from "../package.json";
const vendors = [
"react",
"react-router-dom",
"react-router",
"react-dom",
"@tanstack/react-query",
"axios",

73
frontend/package-lock.json generated
Unescape View File

@ -21,7 +21,7 @@
"braces": "^3.0.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.23.1",
"react-router": "^7.1.1",
"socket.io-client": "^4.7.5"
},
"devDependencies": {
@ -2776,14 +2776,6 @@
"integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
"dev": true
},
"node_modules/@remix-run/router": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
"integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@rollup/plugin-node-resolve": {
"version": "15.2.3",
"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
@ -3370,6 +3362,12 @@
"@babel/types": "^7.20.7"
}
},
"node_modules/@types/cookie": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
"integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
"license": "MIT"
},
"node_modules/@types/d3-array": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
@ -5279,6 +5277,15 @@
"node": "^14.18.0 || >=16.10.0"
}
},
"node_modules/cookie": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
"integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
"license": "MIT",
"engines": {
"node": ">=18"
}
},
"node_modules/core-js-compat": {
"version": "3.36.1",
"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.1.tgz",
@ -9022,33 +9029,27 @@
}
},
"node_modules/react-router": {
"version": "6.23.1",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
"integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.1.tgz",
"integrity": "sha512-39sXJkftkKWRZ2oJtHhCxmoCrBCULr/HAH4IT5DHlgu/Q0FCPV0S4Lx+abjDTx/74xoZzNYDYbOZWlJjruyuDQ==",
"license": "MIT",
"dependencies": {
"@remix-run/router": "1.16.1"
"@types/cookie": "^0.6.0",
"cookie": "^1.0.1",
"set-cookie-parser": "^2.6.0",
"turbo-stream": "2.4.0"
},
"engines": {
"node": ">=14.0.0"
"node": ">=20.0.0"
},
"peerDependencies": {
"react": ">=16.8"
}
},
"node_modules/react-router-dom": {
"version": "6.23.1",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
"integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
"dependencies": {
"@remix-run/router": "1.16.1",
"react-router": "6.23.1"
},
"engines": {
"node": ">=14.0.0"
"react": ">=18",
"react-dom": ">=18"
},
"peerDependencies": {
"react": ">=16.8",
"react-dom": ">=16.8"
"peerDependenciesMeta": {
"react-dom": {
"optional": true
}
}
},
"node_modules/react-smooth": {
@ -9529,6 +9530,12 @@
"randombytes": "^2.1.0"
}
},
"node_modules/set-cookie-parser": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
"integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
"license": "MIT"
},
"node_modules/set-function-length": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@ -10405,6 +10412,12 @@
"node": "*"
}
},
"node_modules/turbo-stream": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
"integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
"license": "ISC"
},
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",

2
frontend/package.json
Unescape View File

@ -25,7 +25,7 @@
"braces": "^3.0.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.23.1",
"react-router": "^7.1.1",
"socket.io-client": "^4.7.5"
},
"devDependencies": {

2
frontend/src/App/Navbar.tsx
Unescape View File

@ -6,7 +6,7 @@ import React, {
useMemo,
useState,
} from "react";
import { matchPath, NavLink, RouteObject, useLocation } from "react-router-dom";
import { matchPath, NavLink, RouteObject, useLocation } from "react-router";
import {
Anchor,
AppShell,

2
frontend/src/App/index.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useEffect, useState } from "react";
import { Outlet, useNavigate } from "react-router-dom";
import { Outlet, useNavigate } from "react-router";
import { AppShell } from "@mantine/core";
import { useWindowEvent } from "@mantine/hooks";
import { showNotification } from "@mantine/notifications";

2
frontend/src/Router/Redirector.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useEffect } from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { LoadingOverlay } from "@mantine/core";
import { useSystemSettings } from "@/apis/hooks";

7
frontend/src/Router/index.tsx
Unescape View File

@ -5,7 +5,7 @@ import {
useContext,
useMemo,
} from "react";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { createBrowserRouter, RouterProvider } from "react-router";
import {
faClock,
faCogs,
@ -324,7 +324,10 @@ export const Router: FunctionComponent = () => {
// TODO: Move this outside the function component scope
const router = useMemo(
() => createBrowserRouter(routes, { basename: Environment.baseUrl }),
() =>
createBrowserRouter(routes, {
basename: Environment.baseUrl,
}),
[routes],
);

2
frontend/src/Router/type.d.ts vendored
Unescape View File

@ -1,4 +1,4 @@
import { RouteObject } from "react-router-dom";
import { RouteObject } from "react-router";
import { IconDefinition } from "@fortawesome/free-solid-svg-icons";
declare namespace Route {

2
frontend/src/components/Search.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useMemo, useState } from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import {
ComboboxItem,
em,

2
frontend/src/pages/Blacklist/Movies/table.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Text } from "@mantine/core";
import { faTrash } from "@fortawesome/free-solid-svg-icons";
import { ColumnDef } from "@tanstack/react-table";

2
frontend/src/pages/Blacklist/Series/table.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Text } from "@mantine/core";
import { faTrash } from "@fortawesome/free-solid-svg-icons";
import { ColumnDef } from "@tanstack/react-table";

2
frontend/src/pages/Episodes/index.tsx
Unescape View File

@ -5,7 +5,7 @@ import {
useRef,
useState,
} from "react";
import { Navigate, useParams } from "react-router-dom";
import { Navigate, useParams } from "react-router";
import { Container, Group, Stack } from "@mantine/core";
import { Dropzone } from "@mantine/dropzone";
import { useDocumentTitle } from "@mantine/hooks";

2
frontend/src/pages/History/Movies/index.tsx
Unescape View File

@ -1,6 +1,6 @@
/* eslint-disable camelcase */
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Badge, Text } from "@mantine/core";
import {
faFileExcel,

2
frontend/src/pages/History/Series/index.tsx
Unescape View File

@ -1,6 +1,6 @@
/* eslint-disable camelcase */
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Badge, Text } from "@mantine/core";
import {
faFileExcel,

2
frontend/src/pages/Movies/Details/index.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useCallback, useRef } from "react";
import { Navigate, useParams } from "react-router-dom";
import { Navigate, useParams } from "react-router";
import { Container, Group, Menu, Stack } from "@mantine/core";
import { Dropzone } from "@mantine/dropzone";
import { useDocumentTitle } from "@mantine/hooks";

2
frontend/src/pages/Movies/index.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Badge, Container } from "@mantine/core";
import { useDocumentTitle } from "@mantine/hooks";
import { faBookmark as farBookmark } from "@fortawesome/free-regular-svg-icons";

2
frontend/src/pages/Series/index.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Container, Group, Progress } from "@mantine/core";
import { useDocumentTitle } from "@mantine/hooks";
import { faBookmark as farBookmark } from "@fortawesome/free-regular-svg-icons";

2
frontend/src/pages/Wanted/Movies/index.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Badge, Group } from "@mantine/core";
import { faSearch } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

2
frontend/src/pages/Wanted/Series/index.tsx
Unescape View File

@ -1,5 +1,5 @@
import { FunctionComponent, useMemo } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Anchor, Badge, Group } from "@mantine/core";
import { faSearch } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

2
frontend/src/pages/views/ItemView.tsx
Unescape View File

@ -1,4 +1,4 @@
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { faList } from "@fortawesome/free-solid-svg-icons";
import { ColumnDef } from "@tanstack/react-table";
import { UsePaginationQueryResult } from "@/apis/queries/hooks";

2
frontend/src/pages/views/MassEditor.tsx
Unescape View File

@ -1,5 +1,5 @@
import { useCallback, useMemo, useRef, useState } from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { Box, Container, useCombobox } from "@mantine/core";
import { faCheck, faUndo } from "@fortawesome/free-solid-svg-icons";
import { UseMutationResult } from "@tanstack/react-query";

6
frontend/src/tests/index.tsx
Unescape View File

@ -4,11 +4,7 @@ import {
ReactElement,
StrictMode,
} from "react";
import {
createBrowserRouter,
RouteObject,
RouterProvider,
} from "react-router-dom";
import { createBrowserRouter, RouteObject, RouterProvider } from "react-router";
import { render, RenderOptions } from "@testing-library/react";
import { AllProviders } from "@/providers";

2
frontend/src/utilities/hooks.ts
Unescape View File

@ -6,7 +6,7 @@ import {
useRef,
useState,
} from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { SliderProps } from "@mantine/core";
import { SelectorOption, SelectorProps } from "@/components";

2
frontend/src/utilities/routers.ts
Unescape View File

@ -1,7 +1,7 @@
// A workaround of built-in hooks in React-Router v6
// https://gist.github.com/rmorse/426ffcc579922a82749934826fa9f743
import { unstable_usePrompt as useUnstablePrompt } from "react-router-dom";
import { unstable_usePrompt as useUnstablePrompt } from "react-router";
// TODO: Replace with Mantine's confirmation modal
export function usePrompt(when: boolean, message: string) {

Write Preview
Loading…
Cancel
Save