alter getBaseUrl

This commit is contained in:
Frank 2023-10-20 15:46:57 +08:00 committed by Arniiiii
parent 22fa664db4
commit 7d7d95cfb9

View file

@ -17,7 +17,7 @@ export function getFetchUrl(settings: IGitSourceSettings): string {
}
// "origin" is SCHEME://HOSTNAME[:PORT]
const baseURL = getBaseUrl(serviceUrl.href)
const baseURL = getBaseUrl(serviceUrl)
return `${baseURL}/${encodedOwner}/${encodedName}`
}
@ -29,9 +29,8 @@ export function getServerUrl(url?: string): URL {
return new URL(urlValue)
}
export function getBaseUrl(url: string): string {
const matcher = url.match(/^[^?]+/)
return (matcher && matcher[0].replace(/\/+$/g, '')) || ''
function getBaseUrl(u: URL) {
return u.protocol + "//" + u.host + u.pathname.replace(/\/+$/g, '');
}
export function getServerApiUrl(url?: string): string {