kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
feat: update dependencies
Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2701>merge-requests/2762/head
Kasper Seweryn
rodzic
fe4af475af
commit
673fe8b828
|
|
@ -21,7 +21,7 @@
|
|||
"@funkwhale/ui": "0.2.2",
|
||||
"@sentry/tracing": "7.47.0",
|
||||
"@sentry/vue": "7.47.0",
|
||||
"@tauri-apps/api": "2.0.0-beta.0",
|
||||
"@tauri-apps/api": "2.0.0-beta.1",
|
||||
"@vitest/coverage-v8": "1.2.2",
|
||||
"@vue/runtime-core": "3.3.11",
|
||||
"@vueuse/core": "10.3.0",
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
"@faker-js/faker": "8.4.1",
|
||||
"@intlify/eslint-plugin-vue-i18n": "2.0.0",
|
||||
"@intlify/unplugin-vue-i18n": "2.0.0",
|
||||
"@tauri-apps/cli": "2.0.0-beta.1",
|
||||
"@tauri-apps/cli": "2.0.0-beta.2",
|
||||
"@types/diff": "5.0.9",
|
||||
"@types/dompurify": "3.0.5",
|
||||
"@types/jquery": "3.5.29",
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ const submit = async () => {
|
|||
if (backendError.response?.status === 400) {
|
||||
errors.value = ['invalid_credentials']
|
||||
} else {
|
||||
errors.value = backendError.backendErrors ?? error.message ?? error
|
||||
errors.value = backendError.backendErrors ?? [error.message ?? error]
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import type { BackendError, User } from '~/types'
|
|||
import type { Module } from 'vuex'
|
||||
import type { RootState } from '~/store/index'
|
||||
import type { RouteLocationRaw } from 'vue-router'
|
||||
import type { WebviewWindow } from '@tauri-apps/api/webview'
|
||||
import type { WebviewWindow } from '@tauri-apps/api/webviewWindow'
|
||||
|
||||
import axios from 'axios'
|
||||
import useLogger from '~/composables/useLogger'
|
||||
|
|
@ -251,7 +251,7 @@ const store: Module<State, RootState> = {
|
|||
},
|
||||
async tryFinishOAuthFlow ({ state }) {
|
||||
if (isTauri()) {
|
||||
return state.oauthWindow?.close().catch(() => {
|
||||
return state.oauthWindow?.close?.().catch(() => {
|
||||
// Ignore the error in case of window being already closed
|
||||
})
|
||||
}
|
||||
|
|
@ -264,7 +264,7 @@ const store: Module<State, RootState> = {
|
|||
const authorizeUrl = `${rootState.instance.instanceUrl}authorize?${params}`
|
||||
|
||||
if (isTauri()) {
|
||||
const { WebviewWindow } = await import('@tauri-apps/api/webview')
|
||||
const { WebviewWindow, getCurrent } = await import('@tauri-apps/api/webviewWindow')
|
||||
|
||||
state.oauthWindow = new WebviewWindow('oauth', {
|
||||
title: `Login to ${rootState.instance.settings.instance.name}`,
|
||||
|
|
@ -273,9 +273,21 @@ const store: Module<State, RootState> = {
|
|||
})
|
||||
|
||||
const token = await new Promise((resolve, reject) => {
|
||||
state.oauthWindow?.once('tauri://error', reject)
|
||||
state.oauthWindow?.once('tauri://destroyed', () => reject(new Error('Aborted by user')))
|
||||
state.oauthWindow?.once('oauthToken', async (event) => resolve(event.payload))
|
||||
if (!state.oauthWindow) return
|
||||
|
||||
const stop = getCurrent().once<string>('oauthToken', async (event) => {
|
||||
resolve(event.payload)
|
||||
})
|
||||
|
||||
state.oauthWindow.once('tauri://error', async (error) => {
|
||||
(await stop)()
|
||||
reject(error)
|
||||
})
|
||||
|
||||
state.oauthWindow.once('tauri://destroyed', async () => {
|
||||
(await stop)()
|
||||
reject(new Error('Aborted by user'))
|
||||
})
|
||||
}).finally(() => dispatch('tryFinishOAuthFlow'))
|
||||
|
||||
commit('oauthToken', token)
|
||||
|
|
@ -301,12 +313,12 @@ const store: Module<State, RootState> = {
|
|||
)
|
||||
|
||||
if (isTauri()) {
|
||||
const { getCurrent } = await import('@tauri-apps/api/window')
|
||||
const { getCurrent } = await import('@tauri-apps/api/webviewWindow')
|
||||
const currentWindow = getCurrent()
|
||||
|
||||
// If the current window is the oauth window, pass the event to the main window
|
||||
if (currentWindow.label === 'oauth') {
|
||||
await currentWindow.emit('oauthToken', response.data)
|
||||
await currentWindow.emitTo('main', 'oauthToken', response.data)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
116
front/yarn.lock
116
front/yarn.lock
|
|
@ -761,76 +761,76 @@
|
|||
resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
|
||||
integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
|
||||
|
||||
"@tauri-apps/api@2.0.0-beta.0":
|
||||
version "2.0.0-beta.0"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-beta.0.tgz#36b10e6f459fd125530ac083262a355b84ce9b95"
|
||||
integrity sha512-WLoh/Vk8cgY7XrJV7Vpb6PssReBZWQCATfYBb1aCRDk+sp0NyPwumx6fZ2ECAKzAcs3OeanluwZcajruIW4CPQ==
|
||||
|
||||
"@tauri-apps/cli-darwin-arm64@2.0.0-beta.1":
|
||||
"@tauri-apps/api@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-beta.1.tgz#ad90a2b82dc0b3f2e08b4bcff2d95797120fc9ea"
|
||||
integrity sha512-d71utEr9H3fXAI6nKPaPuINpnvMQn+UIscOTzTMcrmIDqptOO0ix8z6C3HSvNxV0OjtlxzNJGWwOb24U0OYrgw==
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-beta.1.tgz#8f033495632c5d8b2abeab820d4a2efe4e4a9b32"
|
||||
integrity sha512-Zok1HA5s38E951CD2Osg7qi1/NlT7K1zOK6/nf5t/SKkoRT8KPrPZlJ4zBOImLQpHdaLtEANjcjBfYcbM2noxQ==
|
||||
|
||||
"@tauri-apps/cli-darwin-x64@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-beta.1.tgz#8212d9d2c0d4492f23e4562588c2b1113cb6cd50"
|
||||
integrity sha512-bzsWZjQt5NG1uhbDTGw8Hmvm+J1d+9J7HXMMMwQc4E3kBns95sr4bIoXvgIq3cZYS4uyZOvdhEdjkSGg1c65Lg==
|
||||
"@tauri-apps/cli-darwin-arm64@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-beta.2.tgz#1a1b289ffda7b0c7fdfe703283f0de0284a3d239"
|
||||
integrity sha512-bAchrSNhFlj1U1rBZ3WJYQU5urN9bpaHlSW8UnTEkkDK0bwcLQyf+AYtRFCy8mWHq6n1RhXxVa6nbTg4DZl7RA==
|
||||
|
||||
"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-beta.1.tgz#9713c073b473a9dee8c4b4951e5aa6e0e87febf5"
|
||||
integrity sha512-FMnZpk4a5D9QgZKkT00P3f4CHEZFpn/b+pWfZJ7vxCdir+Cc1eKOHiqhvmMBEeLlYlQFBaYeAK0EaZWnN82ZJA==
|
||||
"@tauri-apps/cli-darwin-x64@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-beta.2.tgz#031690c6c85015753ff379f93305444c1586fccc"
|
||||
integrity sha512-29Zn0GXIID1fQ8PjVBjQ/X1Ho3HcVF7a6BPYRBe1zEUfTKyrKFtHP/RD0tROw+iMh17dl3Li23aV9CCQuhfW5Q==
|
||||
|
||||
"@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-beta.1.tgz#81d83894c3d08c52698da700f127d9d35dc2128a"
|
||||
integrity sha512-0kE65P+6ppeAOFsJV6av5VhkjDv1dcHkObErpjJHpwYowuC3aqaCCnH3biR9gNvcoVUXsCwmMA/BkxUpq9W9/g==
|
||||
"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-beta.2.tgz#38bc667bf964ff34bba655fc239d52194fa7e8eb"
|
||||
integrity sha512-o5esvaBOn7Wr/tQz9HY9CrjeIT7/3bGO3reJk9MUOU6VpwOElGlM7bl7U2I2z1EmZn7GUa7yG2E+p7CMDV9a3w==
|
||||
|
||||
"@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-beta.1.tgz#5239d2dc67e1dafac6a9deb64054028e099957e7"
|
||||
integrity sha512-Wsj1eSrrAVeuFQWJq1gVIA78I8JM50fEsxbrMAOf89ZXpCYxJTNCJkyRQyLB+yHhv9nmhA3a1Mmr5ubhRETy1Q==
|
||||
"@tauri-apps/cli-linux-arm64-gnu@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-beta.2.tgz#cada29cb2053e364de67bbefa6c1ca24e247d24f"
|
||||
integrity sha512-YIA9OZ9+Mf3LW1iQZveUeMySvM3jgf5b0a1MUawYCcuhUJ/FFGaDiia4Z6hOO+p1d8DsswEelzzKyvlBiBJYGA==
|
||||
|
||||
"@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-beta.1.tgz#639c801e431816f1548c5a6a0e63b8449cc80db4"
|
||||
integrity sha512-LkzLJWg+ud2gWuq8yAWJ3Sahrp79Vbd2Cotbm/RbfMi7RbRV8TQYj4zfUhyFJVnk4nF89kTnwfNxLdTw67CAOw==
|
||||
"@tauri-apps/cli-linux-arm64-musl@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-beta.2.tgz#84595a256c3de1f33ad603f4740ee3449839e811"
|
||||
integrity sha512-UNminCTRybPkb9BNyAPo8v4bJ45q9anaIisw7PfGXeuDeHMc2W/fjLlQXipsijMvQ7lakUAjO3ttEM6ctOYJiQ==
|
||||
|
||||
"@tauri-apps/cli-linux-x64-musl@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-beta.1.tgz#d0e07f10ab9de95d117acce1d9787eb6a625013a"
|
||||
integrity sha512-Ro3PuLSNEZAw9/Rc2CP3k9P7LaUQ2TOFXJeW6G4aCXrd0MlJwlGhhjdZuLbmgzD1rda4dSpZGJPhbYvu8YD7eQ==
|
||||
"@tauri-apps/cli-linux-x64-gnu@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-beta.2.tgz#7e8edf156088600916806f0441a79028557e2477"
|
||||
integrity sha512-o0eStDWpKkPdEsbbn98kiA/lOo4vBXnjFrov16lq88h2OThJS7idhSUqBRgqYpsIENMrvjtPJLutBkF9fuTOsw==
|
||||
|
||||
"@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-beta.1.tgz#9b7e964413031cab6bc938468983e4bb80b44d38"
|
||||
integrity sha512-SWNF+5B+lBbW/Kq1wTMVG9x97PqJUOo8eWAr/nlMm3J0lYbTWAa8/ScibaPjq82HiPhv8WCJXlcO6FEqWCoJ2A==
|
||||
"@tauri-apps/cli-linux-x64-musl@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-beta.2.tgz#125f8366cdcf9c992bd35026926730586d9d3a23"
|
||||
integrity sha512-zUhyeIBqIQJ9oy04kNffz7QxxXw32/0l+EEPCwFfhhCQq7y6k34G/br/yjHXXYdNytNn4kYcjwjzXnohUYTu3w==
|
||||
|
||||
"@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-beta.1.tgz#7c390f30135e9c26b6685296bb7890447a92a5f7"
|
||||
integrity sha512-NvfP16fSlfq6GLHJH+gAxEsJn+Jvz3HoxMTLxAg7Ra0ycMODFu4xbNn6Hp7Djn297qTHHLYDva4Np6Whw5DUlQ==
|
||||
"@tauri-apps/cli-win32-arm64-msvc@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-beta.2.tgz#a1fecd90cbb6c8877537db5ad2ead34677074cfc"
|
||||
integrity sha512-YIq7LsgSeUgSbwVDbwZBHzM9/gxWlcIxwMTgmwfSCszZmrzFfxP7JgzVG0VnK1N8UYymunWd9WIX9uUT3XhetQ==
|
||||
|
||||
"@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-beta.1.tgz#a82890bcd8b15feded016a2bfa51a1d199dc17f5"
|
||||
integrity sha512-9TKbDQyVHW0p1a7aXQEKg+MhCyFMpzD26puLKOxbTPiTcRUR4lUFq5Bhf1VR5ihoqnZNhJEtuR1mA16ZrIkuKQ==
|
||||
"@tauri-apps/cli-win32-ia32-msvc@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-beta.2.tgz#1115a1b531b18f306f94f763da3fa17baa532073"
|
||||
integrity sha512-i2p7OS4R9Tq0EQbjU8VldWNLPXuzbWCsDJe78/pCU0nV1OTjjxXv0tzR8d5R2VElC8eOMGnfZr7mRMrKGcZoHQ==
|
||||
|
||||
"@tauri-apps/cli@2.0.0-beta.1":
|
||||
version "2.0.0-beta.1"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-beta.1.tgz#d9e42dd2d2f9319dffcceacb82d18e19b4acf840"
|
||||
integrity sha512-u3AcZPdHsg9qT3e9PSD0H2IVZetQvWuBOyF81CN7/sY+AJGOli7i2d38Bj4wJs50tuMotoseiMcxuyxTlAdBnw==
|
||||
"@tauri-apps/cli-win32-x64-msvc@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-beta.2.tgz#20435b171c08f0af87318173422e0040a222fe3b"
|
||||
integrity sha512-5FYOA/u4xyj1Q/NKvFEEywPsUwBeLEarN/08+5JIjk7xmEIPylaxYxFnfSH0QZiLBDZAFbGIAWt0MRi97eNN5A==
|
||||
|
||||
"@tauri-apps/cli@2.0.0-beta.2":
|
||||
version "2.0.0-beta.2"
|
||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-beta.2.tgz#f949aad7f47691ff1db4fc83a3ab96003bf552ee"
|
||||
integrity sha512-sc5fz1MEqncn8trOaUGn9DeZy7ND3QnGEb3lCPgghjifzceN/UZe69fDUN1N24iJxOhKs5Y2UI1uYK5em8GOGQ==
|
||||
optionalDependencies:
|
||||
"@tauri-apps/cli-darwin-arm64" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-darwin-x64" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-linux-arm64-gnu" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-linux-arm64-musl" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-linux-x64-gnu" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-linux-x64-musl" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-win32-arm64-msvc" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-win32-ia32-msvc" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-win32-x64-msvc" "2.0.0-beta.1"
|
||||
"@tauri-apps/cli-darwin-arm64" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-darwin-x64" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-linux-arm64-gnu" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-linux-arm64-musl" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-linux-x64-gnu" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-linux-x64-musl" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-win32-arm64-msvc" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-win32-ia32-msvc" "2.0.0-beta.2"
|
||||
"@tauri-apps/cli-win32-x64-msvc" "2.0.0-beta.2"
|
||||
|
||||
"@types/cookie@^0.3.3":
|
||||
version "0.3.3"
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue