MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix tauri checks 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2701>
This commit is contained in:
Kasper Seweryn 2024-01-24 19:31:14 +01:00
parent 5647a1072d
commit 14d099b872
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/package.json
View File

@ -21,7 +21,7 @@
"@funkwhale/ui": "0.2.2", "@funkwhale/ui": "0.2.2",
"@sentry/tracing": "7.47.0", "@sentry/tracing": "7.47.0",
"@sentry/vue": "7.47.0", "@sentry/vue": "7.47.0",
"@tauri-apps/api": "1.5.3", "@tauri-apps/api": "2.0.0-alpha.14",
"@vue/runtime-core": "3.3.11", "@vue/runtime-core": "3.3.11",
"@vueuse/core": "10.3.0", "@vueuse/core": "10.3.0",
"@vueuse/integrations": "10.3.0", "@vueuse/integrations": "10.3.0",

6
front/src/init/serviceWorker.ts
View File

@ -9,12 +9,6 @@ const { t } = i18n.global
const logger = useLogger() const logger = useLogger()
export const install: InitModule = ({ store }) => { export const install: InitModule = ({ store }) => {
// NOTE: Return early if we're not running in a browser
if ('TAURI_PLATFORM' in import.meta.env) {
logger.info('Tauri detected, skipping service worker registration')
// return
}
const updateSW = registerSW({ const updateSW = registerSW({
onRegisterError (error) { onRegisterError (error) {
const importStatementsSupported = navigator.userAgent.includes('Chrome') const importStatementsSupported = navigator.userAgent.includes('Chrome')

2
front/src/store/instance.ts
View File

@ -131,7 +131,7 @@ export const TAURI_DEFAULT_INSTANCE_URL = 'tauri://force-instance-chooser/'
// 3. use the url specified when building via VUE_APP_INSTANCE_URL // 3. use the url specified when building via VUE_APP_INSTANCE_URL
// 4. use the current url // 4. use the current url
const DEFAULT_INSTANCE_URL = (() => { const DEFAULT_INSTANCE_URL = (() => {
if ('TAURI_PLATFORM' in import.meta.env) { if ('TAURI_ENV_PLATFORM' in import.meta.env) {
return TAURI_DEFAULT_INSTANCE_URL return TAURI_DEFAULT_INSTANCE_URL
} }