nanakura/moeka-project
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

fix(stage-tamagotchi): not able to route to /settings for hash router

Browse Source
This commit is contained in:
Neko Ayaka
2025-10-12 03:31:04 +08:00
parent 33de7d49bf
commit 4534664cba
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/stage-tamagotchi/src/main/libs/electron/location.ts
+6 -6
View File
@@ -1,4 +1,4 @@
import type { BrowserWindow } from 'electron'
import type { BrowserWindow, LoadFileOptions, LoadURLOptions } from 'electron'
import { join } from 'node:path'
import { env } from 'node:process'
@@ -24,12 +24,12 @@ export function baseUrl(parentOfIndexHtml: string) {
}
}
export async function load(window: BrowserWindow, url: string | { url: string } | { file: string }) {
export async function load(window: BrowserWindow, url: string | { url: string, options?: LoadURLOptions } | { file: string, options?: LoadFileOptions }) {
if (typeof url === 'object' && 'url' in url) {
return await window.loadURL(url.url)
return await window.loadURL(url.url, url.options)
}
if (typeof url === 'object' && 'file' in url) {
return await window.loadFile(url.file)
return await window.loadFile(url.file, url.options)
}
return await window.loadURL(url)
@@ -37,10 +37,10 @@ export async function load(window: BrowserWindow, url: string | { url: string }
export function withHashRoute(baseUrl: string | { url: string } | { file: string }, hashRoute: string) {
if (typeof baseUrl === 'object' && 'url' in baseUrl) {
return { url: `${baseUrl.url}/#${hashRoute}` }
return { url: `${baseUrl.url}/#${hashRoute}` } satisfies { url: string, options?: LoadURLOptions }
}
if (typeof baseUrl === 'object' && 'file' in baseUrl) {
return { file: `${baseUrl.file}#${hashRoute}` }
return { file: `${baseUrl.file}`, options: { hash: hashRoute } } satisfies { file: string, options?: LoadFileOptions }
}
return `${baseUrl}/#${hashRoute}`