Merge conflicts fix (git is a mess)

This commit is contained in:
Captain Jack Sparrow 2024-07-06 15:00:10 +00:00
parent 75b707465f
commit 63fbc9bc64
2 changed files with 4336 additions and 5320 deletions

View File

@ -33,7 +33,7 @@
"@headlessui/react": "^1.7.19", "@headlessui/react": "^1.7.19",
"@ladjs/country-language": "^1.0.3", "@ladjs/country-language": "^1.0.3",
"@marsidev/react-turnstile": "^0.7.1", "@marsidev/react-turnstile": "^0.7.1",
"@movie-web/providers": "github:ztpn/smovproviders#wyzie", "@movie-web/providers": "github:sussy-code/providers",
"@noble/hashes": "^1.4.0", "@noble/hashes": "^1.4.0",
"@plasmohq/messaging": "^0.6.2", "@plasmohq/messaging": "^0.6.2",
"@react-spring/web": "^9.7.3", "@react-spring/web": "^9.7.3",
@ -43,12 +43,12 @@
"classnames": "^2.5.1", "classnames": "^2.5.1",
"core-js": "^3.37.1", "core-js": "^3.37.1",
"detect-browser": "^5.3.0", "detect-browser": "^5.3.0",
"dompurify": "^3.1.5", "dompurify": "^3.1.6",
"flag-icons": "^7.2.3", "flag-icons": "^7.2.3",
"focus-trap-react": "^10.2.3", "focus-trap-react": "^10.2.3",
"fscreen": "^1.2.0", "fscreen": "^1.2.0",
"fuse.js": "^7.0.0", "fuse.js": "^7.0.0",
"hls.js": "^1.5.11", "hls.js": "^1.5.13",
"i18next": "^23.11.5", "i18next": "^23.11.5",
"immer": "^10.1.1", "immer": "^10.1.1",
"jwt-decode": "^4.0.0", "jwt-decode": "^4.0.0",
@ -65,13 +65,13 @@
"react-helmet-async": "^2.0.5", "react-helmet-async": "^2.0.5",
"react-i18next": "^14.1.2", "react-i18next": "^14.1.2",
"react-lazy-with-preload": "^2.2.1", "react-lazy-with-preload": "^2.2.1",
"react-router-dom": "^6.23.1", "react-router-dom": "^6.24.1",
"react-sticky-el": "^2.1.0", "react-sticky-el": "^2.1.0",
"react-use": "^17.5.0", "react-use": "^17.5.0",
"semver": "^7.6.2", "semver": "^7.6.2",
"slugify": "^1.6.6", "slugify": "^1.6.6",
"subsrt-ts": "^2.1.2", "subsrt-ts": "^2.1.2",
"zustand": "^4.5.2" "zustand": "^4.5.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.24.7", "@babel/core": "^7.24.7",
@ -85,7 +85,7 @@
"@types/lodash.isequal": "^4.5.8", "@types/lodash.isequal": "^4.5.8",
"@types/lodash.merge": "^4.6.9", "@types/lodash.merge": "^4.6.9",
"@types/lodash.throttle": "^4.1.9", "@types/lodash.throttle": "^4.1.9",
"@types/node": "^20.14.8", "@types/node": "^20.14.10",
"@types/pako": "^2.0.3", "@types/pako": "^2.0.3",
"@types/react": "^18.3.3", "@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0", "@types/react-dom": "^18.3.0",
@ -110,10 +110,10 @@
"eslint-plugin-prettier": "^5.1.3", "eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "7.33.2", "eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-hooks": "4.6.0",
"glob": "^10.4.2", "glob": "^10.4.3",
"handlebars": "^4.7.8", "handlebars": "^4.7.8",
"jsdom": "^23.2.0", "jsdom": "^23.2.0",
"postcss": "^8.4.38", "postcss": "^8.4.39",
"postcss-rtl": "^2.0.0", "postcss-rtl": "^2.0.0",
"postcss-rtlcss": "^4.0.9", "postcss-rtlcss": "^4.0.9",
"prettier": "^3.3.2", "prettier": "^3.3.2",
@ -122,13 +122,13 @@
"tailwind-scrollbar": "^3.1.0", "tailwind-scrollbar": "^3.1.0",
"tailwindcss": "^3.4.4", "tailwindcss": "^3.4.4",
"tailwindcss-themer": "^4.0.0", "tailwindcss-themer": "^4.0.0",
"type-fest": "^4.20.1", "type-fest": "^4.21.0",
"typescript": "^5.5.2", "typescript": "^5.5.3",
"vite": "^5.3.1", "vite": "^5.3.3",
"vite-plugin-checker": "^0.6.4", "vite-plugin-checker": "^0.6.4",
"vite-plugin-package-version": "^1.1.0", "vite-plugin-package-version": "^1.1.0",
"vite-plugin-pwa": "^0.17.5", "vite-plugin-pwa": "^0.17.5",
"vite-plugin-static-copy": "^1.0.5", "vite-plugin-static-copy": "^1.0.6",
"vitest": "^1.6.0", "vitest": "^1.6.0",
"workbox-window": "^7.1.0" "workbox-window": "^7.1.0"
}, },

File diff suppressed because it is too large Load Diff