fix: 启用启动器更新并修复初始化竞态
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
This commit is contained in:
1 parent
2359b80250
commit
d2a319a4d5
45 files changed
+235
-178
No files matched your search
@@ -1,7 +1,6 @@
|
||||
import assert from 'node:assert/strict'
|
||||
import test from 'node:test'
|
||||
import { useHostedSync } from './useHostedSync.ts'
|
||||
import { useHostedCreation, forgetHostedCreation } from './useHostedCreation.ts'
|
||||
|
||||
import {
|
||||
clearHostedSession,
|
||||
hostedCreate,
|
||||
@@ -10,12 +9,11 @@ import {
|
||||
onHostedPackAttemptStarted,
|
||||
setInstanceMode,
|
||||
} from '../helpers/hosted-packs.ts'
|
||||
|
||||
import {
|
||||
openSkinSiteLogin,
|
||||
receiveSkinSiteMessage,
|
||||
requestSkinSiteLuck,
|
||||
requestSkinSiteDownloadToken,
|
||||
requestSkinSiteLuck,
|
||||
requestSkinSitePlayers,
|
||||
requestSkinSiteSkinUpdate,
|
||||
resetSkinSiteSession,
|
||||
@@ -27,6 +25,8 @@ import {
|
||||
skinSiteStatus,
|
||||
skinSiteUser,
|
||||
} from './skin-site-session.ts'
|
||||
import { forgetHostedCreation, useHostedCreation } from './useHostedCreation.ts'
|
||||
import { useHostedSync } from './useHostedSync.ts'
|
||||
|
||||
test('reconnecting the same skin site frame waits for verification instead of reporting signed out', () => {
|
||||
const frame = { postMessage() {} } as unknown as Window
|
||||
|
||||
@@ -13,9 +13,9 @@ import type {
|
||||
SymlinkMethodChoice,
|
||||
} from '@modrinth/ui'
|
||||
import { useDebugLogger, useGlobalDrop, useInstanceContext, useVIntl } from '@modrinth/ui'
|
||||
import { join } from '@tauri-apps/api/path'
|
||||
import { computed, type ComputedRef, nextTick, ref } from 'vue'
|
||||
import type { Router } from 'vue-router'
|
||||
import { join } from '@tauri-apps/api/path'
|
||||
|
||||
import {
|
||||
classifyDroppedItem,
|
||||
@@ -1412,10 +1412,7 @@ export function useDropImport(options: DropImportOptions) {
|
||||
cleanupLauncherZipTemp()
|
||||
}
|
||||
|
||||
function resolvedInstancePath(
|
||||
inst: SelectedInstance,
|
||||
ctx: ImportContext | null,
|
||||
): string | undefined {
|
||||
function resolvedInstancePath(inst: SelectedInstance): string | undefined {
|
||||
if (inst.compatibleMode) return inst.versionPath
|
||||
return inst.path
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user