mirror of
https://github.com/p-stream/p-stream.git
synced 2026-03-11 17:55:33 +00:00
Merge branch 'main' into new-prod
This commit is contained in:
commit
5ae5da7f22
3 changed files with 946 additions and 984 deletions
30
package.json
30
package.json
|
|
@ -37,14 +37,14 @@
|
|||
"@ladjs/country-language": "^1.0.3",
|
||||
"@marsidev/react-turnstile": "^0.7.2",
|
||||
"@movie-web/providers": "github:p-stream/providers#production",
|
||||
"@noble/hashes": "^1.7.2",
|
||||
"@noble/hashes": "^1.8.0",
|
||||
"@plasmohq/messaging": "^0.6.2",
|
||||
"@react-spring/web": "^9.7.5",
|
||||
"@scure/bip39": "^1.5.4",
|
||||
"@scure/bip39": "^1.6.0",
|
||||
"@sozialhelden/ietf-language-tags": "^5.4.2",
|
||||
"@types/node-forge": "^1.3.11",
|
||||
"classnames": "^2.5.1",
|
||||
"core-js": "^3.41.0",
|
||||
"core-js": "^3.42.0",
|
||||
"detect-browser": "^5.3.0",
|
||||
"dompurify": "^3.2.5",
|
||||
"flag-icons": "^7.3.2",
|
||||
|
|
@ -78,10 +78,10 @@
|
|||
"zustand": "^4.5.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.26.10",
|
||||
"@babel/preset-env": "^7.26.9",
|
||||
"@babel/preset-typescript": "^7.27.0",
|
||||
"@rollup/wasm-node": "^4.40.0",
|
||||
"@babel/core": "^7.27.1",
|
||||
"@babel/preset-env": "^7.27.2",
|
||||
"@babel/preset-typescript": "^7.27.1",
|
||||
"@rollup/wasm-node": "^4.40.2",
|
||||
"@types/chromecast-caf-sender": "^1.0.11",
|
||||
"@types/crypto-js": "^4.2.2",
|
||||
"@types/dompurify": "^3.2.0",
|
||||
|
|
@ -89,10 +89,10 @@
|
|||
"@types/lodash.isequal": "^4.5.8",
|
||||
"@types/lodash.merge": "^4.6.9",
|
||||
"@types/lodash.throttle": "^4.1.9",
|
||||
"@types/node": "^20.17.30",
|
||||
"@types/node": "^20.17.44",
|
||||
"@types/pako": "^2.0.3",
|
||||
"@types/react": "^18.3.20",
|
||||
"@types/react-dom": "^18.3.6",
|
||||
"@types/react": "^18.3.21",
|
||||
"@types/react-dom": "^18.3.7",
|
||||
"@types/react-helmet": "^6.1.11",
|
||||
"@types/react-lazy-load-image-component": "^1.6.4",
|
||||
"@types/react-router": "^5.1.20",
|
||||
|
|
@ -102,16 +102,16 @@
|
|||
"@types/semver": "^7.7.0",
|
||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
||||
"@typescript-eslint/parser": "^6.21.0",
|
||||
"@vitejs/plugin-react": "^4.4.0",
|
||||
"@vitejs/plugin-react": "^4.4.1",
|
||||
"autoprefixer": "^10.4.21",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^8.57.1",
|
||||
"eslint-config-airbnb": "19.0.4",
|
||||
"eslint-config-prettier": "^9.1.0",
|
||||
"eslint-import-resolver-typescript": "^3.10.0",
|
||||
"eslint-import-resolver-typescript": "^3.10.1",
|
||||
"eslint-plugin-import": "^2.31.0",
|
||||
"eslint-plugin-jsx-a11y": "^6.10.2",
|
||||
"eslint-plugin-prettier": "^5.2.6",
|
||||
"eslint-plugin-prettier": "^5.4.0",
|
||||
"eslint-plugin-react": "7.33.2",
|
||||
"eslint-plugin-react-hooks": "4.6.0",
|
||||
"glob": "^10.4.5",
|
||||
|
|
@ -126,9 +126,9 @@
|
|||
"tailwind-scrollbar": "^3.1.0",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"tailwindcss-themer": "^4.1.1",
|
||||
"type-fest": "^4.40.0",
|
||||
"type-fest": "^4.41.0",
|
||||
"typescript": "^5.8.3",
|
||||
"vite": "^5.4.18",
|
||||
"vite": "^5.4.19",
|
||||
"vite-plugin-checker": "^0.6.4",
|
||||
"vite-plugin-package-version": "^1.1.0",
|
||||
"vite-plugin-pwa": "^0.17.5",
|
||||
|
|
|
|||
1870
pnpm-lock.yaml
1870
pnpm-lock.yaml
File diff suppressed because it is too large
Load diff
|
|
@ -56,9 +56,6 @@ export function useSettingsState(
|
|||
enableDiscover: boolean,
|
||||
enableDetailsModal: boolean,
|
||||
sourceOrder: string[],
|
||||
enableSourceOrder: boolean,
|
||||
proxyTmdb: boolean,
|
||||
enableSkipCredits: boolean,
|
||||
) {
|
||||
const [proxyUrlsState, setProxyUrls, resetProxyUrls, proxyUrlsChanged] =
|
||||
useDerived(proxyUrls);
|
||||
|
|
@ -128,14 +125,6 @@ export function useSettingsState(
|
|||
resetSourceOrder,
|
||||
sourceOrderChanged,
|
||||
] = useDerived(sourceOrder);
|
||||
const [
|
||||
enableSourceOrderState,
|
||||
setEnableSourceOrderState,
|
||||
resetEnableSourceOrder,
|
||||
enableSourceOrderChanged,
|
||||
] = useDerived(enableSourceOrder);
|
||||
const [proxyTmdbState, setProxyTmdbState, resetProxyTmdb, proxyTmdbChanged] =
|
||||
useDerived(proxyTmdb);
|
||||
|
||||
function reset() {
|
||||
resetTheme();
|
||||
|
|
@ -153,8 +142,6 @@ export function useSettingsState(
|
|||
resetEnableDiscover();
|
||||
resetEnableDetailsModal();
|
||||
resetSourceOrder();
|
||||
resetEnableSourceOrder();
|
||||
resetProxyTmdb();
|
||||
}
|
||||
|
||||
const changed =
|
||||
|
|
@ -168,12 +155,7 @@ export function useSettingsState(
|
|||
profileChanged ||
|
||||
enableThumbnailsChanged ||
|
||||
enableAutoplayChanged ||
|
||||
enableSkipCreditsChanged ||
|
||||
enableDiscoverChanged ||
|
||||
enableDetailsModalChanged ||
|
||||
sourceOrderChanged ||
|
||||
enableSourceOrderChanged ||
|
||||
proxyTmdbChanged;
|
||||
sourceOrderChanged;
|
||||
|
||||
return {
|
||||
reset,
|
||||
|
|
@ -248,15 +230,5 @@ export function useSettingsState(
|
|||
set: setSourceOrderState,
|
||||
changed: sourceOrderChanged,
|
||||
},
|
||||
enableSourceOrder: {
|
||||
state: enableSourceOrderState,
|
||||
set: setEnableSourceOrderState,
|
||||
changed: enableSourceOrderChanged,
|
||||
},
|
||||
proxyTmdb: {
|
||||
state: proxyTmdbState,
|
||||
set: setProxyTmdbState,
|
||||
changed: proxyTmdbChanged,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue