diff --git a/lib/util/http/bitbucket-server.ts b/lib/util/http/bitbucket-server.ts index 8be6add6b1de1f55965e128d46de4951d154d8cc..c3017256d73c2f51b4ea0fb4c362a4a60c538ae3 100644 --- a/lib/util/http/bitbucket-server.ts +++ b/lib/util/http/bitbucket-server.ts @@ -1,5 +1,5 @@ -import URL from 'url'; import { PLATFORM_TYPE_BITBUCKET_SERVER } from '../../constants/platforms'; +import { resolveBaseUrl } from '../url'; import { Http, HttpOptions, HttpResponse, InternalHttpOptions } from '.'; let baseUrl: string; @@ -16,7 +16,7 @@ export class BitbucketServerHttp extends Http { path: string, options?: InternalHttpOptions ): Promise<HttpResponse<T> | null> { - const url = URL.resolve(baseUrl, path); + const url = resolveBaseUrl(baseUrl, path); const opts = { baseUrl, ...options, diff --git a/lib/util/http/bitbucket.ts b/lib/util/http/bitbucket.ts index cb8266da9651f82b460e7434af51c56d10bc1e19..f64653e84a04614e2f9d5538f635147848649aca 100644 --- a/lib/util/http/bitbucket.ts +++ b/lib/util/http/bitbucket.ts @@ -1,4 +1,3 @@ -import { URL } from 'url'; import { PLATFORM_TYPE_BITBUCKET } from '../../constants/platforms'; import { Http, HttpOptions, HttpResponse, InternalHttpOptions } from '.'; diff --git a/lib/util/http/gitea.ts b/lib/util/http/gitea.ts index a549fd5ec90e94607a3a5031dcfc9c636eb3f824..ab1e0622591efea4e8a55be4a58bcf5af97f8f59 100644 --- a/lib/util/http/gitea.ts +++ b/lib/util/http/gitea.ts @@ -1,5 +1,5 @@ -import url from 'url'; import { PLATFORM_TYPE_GITEA } from '../../constants/platforms'; +import { resolveBaseUrl } from '../url'; import { Http, HttpOptions, HttpResponse, InternalHttpOptions } from '.'; let baseUrl; @@ -24,8 +24,8 @@ function getPaginationContainer(body: any): any[] { } function resolveUrl(path: string, base: string): URL { - const resolvedUrlString = url.resolve(base, path); - return new url.URL(resolvedUrlString); + const resolvedUrlString = resolveBaseUrl(base, path); + return new URL(resolvedUrlString); } export class GiteaHttp extends Http<GiteaHttpOptions, GiteaHttpOptions> { diff --git a/lib/util/http/gitlab.ts b/lib/util/http/gitlab.ts index e42e0d59262afdcae3b18123c3b27f9fc2d186cf..13bd3028171aeadf7afffa46331eeb40929ffea1 100644 --- a/lib/util/http/gitlab.ts +++ b/lib/util/http/gitlab.ts @@ -1,4 +1,3 @@ -import { URL } from 'url'; import parseLinkHeader from 'parse-link-header'; import { PLATFORM_TYPE_GITLAB } from '../../constants/platforms'; import { logger } from '../../logger';