Skip to content

Commit

Permalink
fix(npm-resolver): always add trailing slash to registry URL (#4067)
Browse files Browse the repository at this point in the history
ref #4052
  • Loading branch information
zkochan committed Dec 4, 2021
1 parent e300640 commit 81ed156
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/sixty-houses-clap.md
@@ -0,0 +1,5 @@
---
"@pnpm/npm-resolver": patch
---

Always add a trailing slash to the registry URL [#4052](https://github.com/pnpm/pnpm/issues/4052).
2 changes: 1 addition & 1 deletion packages/npm-resolver/src/fetch.ts
Expand Up @@ -105,5 +105,5 @@ function toUri (pkgName: string, registry: string) {
encodedName = encodeURIComponent(pkgName)
}

return new url.URL(encodedName, registry).toString()
return new url.URL(encodedName, registry.endsWith('/') ? registry : `${registry}/`).toString()
}
26 changes: 26 additions & 0 deletions packages/npm-resolver/test/index.ts
Expand Up @@ -1666,3 +1666,29 @@ test('resolveFromNpm() fails if the meta file contains invalid shasum', async ()
resolve({ alias: 'is-positive', pref: '1.0.0' }, { registry })
).rejects.toThrow('Tarball "https://registry.npmjs.org/is-positive/-/is-positive-1.0.0.tgz" has invalid shasum specified in its metadata: a')
})

test('resolveFromNpm() should normalize the registry', async () => {
nock('https://reg.com/owner')
.get('/is-positive')
.reply(200, isPositiveMeta)

const cacheDir = tempy.directory()
const resolve = createResolveFromNpm({
cacheDir,
})
const resolveResult = await resolve({ alias: 'is-positive', pref: '1.0.0' }, {
registry: 'https://reg.com/owner',
})

expect(resolveResult!.resolvedVia).toBe('npm-registry')
expect(resolveResult!.id).toBe('registry.npmjs.org/is-positive/1.0.0')
expect(resolveResult!.latest!.split('.').length).toBe(3)
expect(resolveResult!.resolution).toStrictEqual({
integrity: 'sha512-9cI+DmhNhA8ioT/3EJFnt0s1yehnAECyIOXdT+2uQGzcEEBaj8oNmVWj33+ZjPndMIFRQh8JeJlEu1uv5/J7pQ==',
registry: 'https://reg.com/owner',
tarball: 'https://registry.npmjs.org/is-positive/-/is-positive-1.0.0.tgz',
})
expect(resolveResult!.manifest).toBeTruthy()
expect(resolveResult!.manifest!.name).toBe('is-positive')
expect(resolveResult!.manifest!.version).toBe('1.0.0')
})

0 comments on commit 81ed156

Please sign in to comment.