mirror of
https://github.com/lovell/sharp.git
synced 2025-07-09 18:40:16 +02:00
Ensure Yarn PnP hash calculation works with pre-releases (#4347)
This commit is contained in:
parent
5ee83d13e2
commit
2035492fd9
@ -113,7 +113,9 @@ const sha512 = (s) => createHash('sha512').update(s).digest('hex');
|
|||||||
const yarnLocator = () => {
|
const yarnLocator = () => {
|
||||||
try {
|
try {
|
||||||
const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
|
const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
|
||||||
const npmVersion = semverCoerce(optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`]).version;
|
const npmVersion = semverCoerce(optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
|
||||||
|
includePrerelease: true
|
||||||
|
}).version;
|
||||||
return sha512(`${identHash}npm:${npmVersion}`).slice(0, 10);
|
return sha512(`${identHash}npm:${npmVersion}`).slice(0, 10);
|
||||||
} catch {}
|
} catch {}
|
||||||
return '';
|
return '';
|
||||||
|
@ -179,7 +179,7 @@ describe('libvips binaries', function () {
|
|||||||
process.env.npm_config_arch = 's390x';
|
process.env.npm_config_arch = 's390x';
|
||||||
process.env.npm_config_libc = '';
|
process.env.npm_config_libc = '';
|
||||||
const locatorHash = libvips.yarnLocator();
|
const locatorHash = libvips.yarnLocator();
|
||||||
assert.strictEqual(locatorHash, '9b2ea457de');
|
assert.strictEqual(locatorHash, 'e34c58507a');
|
||||||
delete process.env.npm_config_platform;
|
delete process.env.npm_config_platform;
|
||||||
delete process.env.npm_config_arch;
|
delete process.env.npm_config_arch;
|
||||||
delete process.env.npm_config_libc;
|
delete process.env.npm_config_libc;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user