mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-03-30 04:52:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert: "fix(git-resolver): wrong scheme to git ls-remote (#6806)"

Browse Source 
This reverts commit 6fe0b60e61.

ref #6827
This commit is contained in:
Zoltan Kochan
2023-07-18 12:42:17 +03:00
parent a35ec3fd92
commit de9b6c20d4
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.changeset/good-goats-rest.md Normal file
View File

@@ -0,0 +1,6 @@
---
"pnpm": patch
"@pnpm/git-resolver": patch
---
Temporarily revert the fix to [#6805](https://github.com/pnpm/pnpm/issues/6805) to fix the regression it caused [#6827](https://github.com/pnpm/pnpm/issues/6827).

18
resolving/git-resolver/src/parsePref.ts
View File

@@ -61,10 +61,10 @@ function urlToFetchSpec (urlparse: URL) {
return fetchSpec
}
async function fromHostedGit (hosted: HostedGit): Promise<HostedPackageSpec> {
async function fromHostedGit (hosted: any): Promise<HostedPackageSpec> { // eslint-disable-line
let fetchSpec: string | null = null
// try git/https url before fallback to ssh url
const gitUrl = hosted.https({ noCommittish: true, noGitPlus: true }) ?? hosted.ssh({ noCommittish: true })
const gitUrl = hosted.https({ noCommittish: true }) ?? hosted.ssh({ noCommittish: true })
if (gitUrl && await accessRepository(gitUrl)) {
fetchSpec = gitUrl
}
@@ -77,11 +77,11 @@ async function fromHostedGit (hosted: HostedGit): Promise<HostedPackageSpec> {
fetchSpec: httpsUrl,
hosted: {
...hosted,
_fill: (hosted as any)._fill, // eslint-disable-line @typescript-eslint/no-explicit-any
_fill: hosted._fill,
tarball: undefined,
} as any, // eslint-disable-line @typescript-eslint/no-explicit-any
},
normalizedPref: `git+${httpsUrl}`,
...setGitCommittish(hosted.committish!),
...setGitCommittish(hosted.committish),
}
} else {
try {
@@ -111,11 +111,11 @@ async function fromHostedGit (hosted: HostedGit): Promise<HostedPackageSpec> {
fetchSpec: fetchSpec!,
hosted: {
...hosted,
_fill: (hosted as any)._fill, // eslint-disable-line @typescript-eslint/no-explicit-any
_fill: hosted._fill,
tarball: hosted.tarball,
} as any, // eslint-disable-line @typescript-eslint/no-explicit-any
normalizedPref: hosted.auth ? fetchSpec! : hosted.shortcut(),
...setGitCommittish(hosted.committish!),
},
normalizedPref: hosted.shortcut(),
...setGitCommittish(hosted.committish),
}
}

6
resolving/git-resolver/test/index.ts
View File

@@ -414,9 +414,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\trefs/heads/master\
const resolveResult = await resolveFromGit({ pref: 'git+https://0000000000000000000000000000000000000000:x-oauth-basic@github.com/foo/bar.git' })
expect(resolveResult).toStrictEqual({
id: '0000000000000000000000000000000000000000+x-oauth-basic@github.com/foo/bar/0000000000000000000000000000000000000000',
normalizedPref: 'https://0000000000000000000000000000000000000000:x-oauth-basic@github.com/foo/bar.git',
normalizedPref: 'git+https://0000000000000000000000000000000000000000:x-oauth-basic@github.com/foo/bar.git',
resolution: {
tarball: 'https://codeload.github.com/foo/bar/tar.gz/0000000000000000000000000000000000000000',
commit: '0000000000000000000000000000000000000000',
repo: 'https://0000000000000000000000000000000000000000:x-oauth-basic@github.com/foo/bar.git',
type: 'git',
},
resolvedVia: 'git-repository',
})