jellyfin/jellyfin-vue
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-vue.git synced 2026-09-03 05:10:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: external dependency's types

Browse Source 
* Upgrade to the new Vuetify 3.1.11, which fixes all missing VGrid types
* Upgrade axios and @jellyfin-sdk. Mismatched axios versions caused type errors
This commit is contained in:
Fernando Fernández
2023-04-03 12:52:57 +02:00
parent c1d8886388
commit 2461dffc95
3 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/package.json
+3 -3
View File
@@ -26,10 +26,10 @@
"vue-i18n-extract-remove": "vue-i18n-extract --remove"
},
"dependencies": {
"@jellyfin/sdk": "0.0.0-unstable.202301101857",
"@jellyfin/sdk": "0.0.0-unstable.202303210502",
"@vueuse/components": "9.12.0",
"@vueuse/core": "9.12.0",
"axios": "0.27.2",
"axios": "1.3.4",
"blurhash": "1.1.5",
"comlink": "4.3.1",
"date-fns": "2.28.0",
@@ -45,7 +45,7 @@
"vue": "3.2.39",
"vue-i18n": "9.2.2",
"vue-router": "4.1.5",
"vuetify": "3.1.10"
"vuetify": "3.1.11"
},
"devDependencies": {
"@iconify/json": "2.1.104",
frontend/src/plugins/remote/axios/index.ts
+9 -3
View File
@@ -2,14 +2,20 @@
* Instantiates the Axios instance used for the SDK and requests
*/
import { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
import axios, {
AxiosError,
AxiosResponse,
InternalAxiosRequestConfig
} from 'axios';
import remote from '../auth';
import { itemsStore } from '@/store';
import { useSnackbar, usei18n, useLoading } from '@/composables';
import { excludedProgressEndpoints } from '@/composables/use-loading';
class JellyfinInterceptors {
public startLoadInterceptor(config: AxiosRequestConfig): AxiosRequestConfig {
public startLoadInterceptor(
config: InternalAxiosRequestConfig
): InternalAxiosRequestConfig {
if (config.url) {
const loading = useLoading();
const isExcluded = excludedProgressEndpoints.some((i) =>
@@ -73,7 +79,7 @@ class JellyfinInterceptors {
if (
error.response?.status === 401 &&
remote.currentUser &&
!error.config.url?.includes('/Sessions/Logout')
!error.config?.url?.includes('/Sessions/Logout')
) {
await remote.logoutCurrentUser(true);
useSnackbar(usei18n().t('login.kickedOut'), 'error');
package-lock.json
Generated
+26 -35
View File
@@ -21,10 +21,10 @@
"version": "0.2.0",
"license": "GPL-3.0-only",
"dependencies": {
"@jellyfin/sdk": "0.0.0-unstable.202301101857",
"@jellyfin/sdk": "0.0.0-unstable.202303210502",
"@vueuse/components": "9.12.0",
"@vueuse/core": "9.12.0",
"axios": "0.27.2",
"axios": "1.3.4",
"blurhash": "1.1.5",
"comlink": "4.3.1",
"date-fns": "2.28.0",
@@ -40,7 +40,7 @@
"vue": "3.2.39",
"vue-i18n": "9.2.2",
"vue-router": "4.1.5",
"vuetify": "3.1.10"
"vuetify": "3.1.11"
},
"devDependencies": {
"@iconify/json": "2.1.104",
@@ -92,30 +92,6 @@
"yarn": "Yarn is not supported. Please use NPM."
}
},
"frontend/node_modules/@jellyfin/sdk": {
"version": "0.0.0-unstable.202301101857",
"resolved": "https://registry.npmjs.org/@jellyfin/sdk/-/sdk-0.0.0-unstable.202301101857.tgz",
"integrity": "sha512-Afr3IWWyKCQCYlXT/qHHhDCpp3towzYO+IBZAyB5xihiqC9+wq1/GoleSRmxY1peKzo0ycWH1u2vDhwfVCGHdg==",
"dependencies": {
"axios": "1.2.1",
"compare-versions": "5.0.3"
}
},
"frontend/node_modules/@jellyfin/sdk/node_modules/axios": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz",
"integrity": "sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==",
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
},
"frontend/node_modules/compare-versions": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-5.0.3.tgz",
"integrity": "sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A=="
},
"node_modules/@ampproject/remapping": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
@@ -2261,6 +2237,15 @@
"resolved": "tauri",
"link": true
},
"node_modules/@jellyfin/sdk": {
"version": "0.0.0-unstable.202303210502",
"resolved": "https://registry.npmjs.org/@jellyfin/sdk/-/sdk-0.0.0-unstable.202303210502.tgz",
"integrity": "sha512-z+GAtGwLuzTkq1CWbzZneqgAwtDqkBpM+Ub89EYYwVLzRR4JLLnOewDeuaQ84F3bDayEvUa543gTXBsFAAC6lQ==",
"dependencies": {
"axios": "1.3.4",
"compare-versions": "5.0.3"
}
},
"node_modules/@jimp/bmp": {
"version": "0.16.1",
"resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.1.tgz",
@@ -4581,12 +4566,13 @@
}
},
"node_modules/axios": {
"version": "0.27.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
"integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
"dependencies": {
"follow-redirects": "^1.14.9",
"form-data": "^4.0.0"
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
},
"node_modules/babel-plugin-polyfill-corejs2": {
@@ -6014,6 +6000,11 @@
"node": ">=4.0.0"
}
},
"node_modules/compare-versions": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-5.0.3.tgz",
"integrity": "sha512-4UZlZP8Z99MGEY+Ovg/uJxJuvoXuN4M6B3hKaiackiHrgzQFEe3diJi1mf1PNHbFujM7FvLrK2bpgIaImbtZ1A=="
},
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -15266,9 +15257,9 @@
}
},
"node_modules/vuetify": {
"version": "3.1.10",
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.1.10.tgz",
"integrity": "sha512-TFugKhjYO+xktnexHcs/vdsqtq+MZk8MDLbSJX9vMsA58LPwO4atdBbWhQ1Pf8q1jPISpxDF6njjsZHPQQsHCA==",
"version": "3.1.11",
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.1.11.tgz",
"integrity": "sha512-EAR/7vdYY0jCYW+sn9owl6CC5QsWFw100KJnK0ahdHnFj9B93PR5xetekge8BsEWx6bSnsRIOdPyvud+p29wow==",
"engines": {
"node": "^12.20 || >=14.13"
},