diff --git a/lib/util/git/url.spec.ts b/lib/util/git/url.spec.ts index 8c2eaf6978c061f4d3974716387999fdf156ea13..7dfee16cd928741c72c7c70cd4ac37ca66d46c27 100644 --- a/lib/util/git/url.spec.ts +++ b/lib/util/git/url.spec.ts @@ -12,10 +12,12 @@ describe('util/git/url', () => { full_name: '', git_suffix: false, hash: '', + host: 'gitlab.com:8443', href: 'https://gitlab.com:8443', name: '', organization: '', owner: '', + parse_failed: false, password: '', pathname: '/', port: '8443', @@ -25,7 +27,7 @@ describe('util/git/url', () => { ref: '', resource: 'gitlab.com', search: '', - source: 'gitlab.com:8443', + source: 'gitlab.com', toString: expect.toBeFunction(), token: '', user: '', diff --git a/lib/util/git/url.ts b/lib/util/git/url.ts index 22983f85dadf12ecfc5857165b15aaa73080e14c..7136246621c2c28506772d5797cc70552133e0f9 100644 --- a/lib/util/git/url.ts +++ b/lib/util/git/url.ts @@ -5,17 +5,7 @@ import * as hostRules from '../host-rules'; import { regEx } from '../regex'; export function parseGitUrl(url: string): gitUrlParse.GitUrl { - const parsed = gitUrlParse(url); - - // Workaround for https://github.com/IonicaBizau/parse-path/issues/38 - if (parsed.port && parsed.resource.endsWith(`:${parsed.port}`)) { - parsed.resource = parsed.resource.substring( - 0, - parsed.resource.length - `:${parsed.port}`.length - ); - } - - return parsed; + return gitUrlParse(url); } export function getHttpUrl(url: string, token?: string): string { diff --git a/package.json b/package.json index a5b2ce4f4a673368598c44f3c51a52281c61ad5c..bc5d66e7f309dcc7c69471978af1e651ac9fd127 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "find-packages": "9.0.9", "find-up": "5.0.0", "fs-extra": "10.1.0", - "git-url-parse": "12.0.0", + "git-url-parse": "13.0.0", "github-url-from-git": "1.5.0", "global-agent": "3.0.0", "good-enough-parser": "1.1.19", diff --git a/yarn.lock b/yarn.lock index 460ff2b55f5f2142d075cd0cf6fd3caab431fac3..a511b17fb3b49967fdbc54fc8794131b23214a73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5063,20 +5063,20 @@ git-raw-commits@^2.0.0: split2 "^3.0.0" through2 "^4.0.0" -git-up@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/git-up/-/git-up-6.0.0.tgz#dbd6e4eee270338be847a0601e6d0763c90b74db" - integrity sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA== +git-up@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-7.0.0.tgz#bace30786e36f56ea341b6f69adfd83286337467" + integrity sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ== dependencies: is-ssh "^1.4.0" - parse-url "^7.0.2" + parse-url "^8.1.0" -git-url-parse@12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-12.0.0.tgz#4ba70bc1e99138321c57e3765aaf7428e5abb793" - integrity sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q== +git-url-parse@13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.0.0.tgz#9a18d0eaec579fb6379c368aecb09f00b544669c" + integrity sha512-X1kozCqKL82dMrCLi4vie9SHDC+QugKskAMs4VUbIkhURKg5yDwxDmf6Ixg73J+/xVgK5TXKhzn8a94nHJHpnA== dependencies: - git-up "^6.0.0" + git-up "^7.0.0" github-url-from-git@1.5.0: version "1.5.0" @@ -7305,7 +7305,7 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-url@^6.0.0, normalize-url@^6.0.1, normalize-url@^6.1.0: +normalize-url@^6.0.0, normalize-url@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== @@ -7809,22 +7809,19 @@ parse-link-header@2.0.0: dependencies: xtend "~4.0.1" -parse-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-5.0.0.tgz#f933152f3c6d34f4cf36cfc3d07b138ac113649d" - integrity sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A== +parse-path@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b" + integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog== dependencies: protocols "^2.0.0" -parse-url@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-7.0.2.tgz#d21232417199b8d371c6aec0cedf1406fd6393f0" - integrity sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg== +parse-url@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d" + integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w== dependencies: - is-ssh "^1.4.0" - normalize-url "^6.1.0" - parse-path "^5.0.0" - protocols "^2.0.1" + parse-path "^7.0.0" path-exists@^3.0.0: version "3.0.0"