alter getBaseUrl

This commit is contained in:
Frank 2023-10-20 15:46:57 +08:00
parent 61d93be5e5
commit efa69110c5

View File

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