Skip to content

Commit 719eb0c

Browse files
committed
feat: use integrity field from yarn.lock as sha512 for nix derivation
Based off canva-public#11
1 parent 0ebc118 commit 719eb0c

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

lib/print.js

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class Package {
157157
* src: {
158158
* type: 'url',
159159
* url: string,
160-
* sha1?: string,
160+
* hash?: string,
161161
* } | {
162162
* type: 'local',
163163
* },
@@ -200,25 +200,34 @@ class Package {
200200
*/
201201
static create(
202202
pkgInfo,
203-
// @ts-ignore because there is no optionalDependencies in the type
204-
{ version, resolved, dependencies = {}, optionalDependencies = {} }
203+
// @ts-ignore because type lacks: integrity, optionalDependencies
204+
{ version, integrity, resolved, dependencies = {}, optionalDependencies = {} }
205205
) {
206206
const { scope = '', name } = Id.parse(pkgInfo.name);
207207

208208
/** @type {Package['src']} */
209209
let src;
210210
if (resolved && resolved.startsWith('https')) {
211211
const parsedUrl = new URL(resolved);
212+
let hash = integrity;
213+
212214
// prettier-ignore
213-
if (['registry.yarnpkg.com', 'registry.npmjs.org'].includes(parsedUrl.host)) {
215+
if (!hash && ['registry.yarnpkg.com', 'registry.npmjs.org'].includes(parsedUrl.host)) {
216+
const urlSha1 = parsedUrl.hash.slice(1);
217+
if (urlSha1) {
218+
hash = `sha1-${urlSha1}`;
219+
}
220+
}
221+
222+
if (hash) {
214223
src = {
215-
sha1: parsedUrl.hash.slice(1), // cut off the first ('#') character
224+
hash,
216225
url: parsedUrl.origin + parsedUrl.pathname,
217226
type: 'url',
218227
};
219228
} else {
220229
src = {
221-
sha1: undefined, // We don't provide sha in order to force to override it manually
230+
hash: undefined, // We don't provide hash in order to force to override it manually
222231
url: parsedUrl.origin + parsedUrl.pathname,
223232
type: 'url',
224233
};
@@ -306,7 +315,7 @@ class Package {
306315
renderSrc() {
307316
switch (this.src.type) {
308317
case 'url':
309-
const { url, sha1 } = this.src;
318+
const { url, hash } = this.src;
310319
// Some of the urls can look like "https://codeload.github.com/xolvio/cucumber-js/tar.gz/cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
311320
// i.e. no extention given. That's why Nix unable to recognize the type of archive so we need to have
312321
// name specified explicitly to all Nix to infer the archive type.
@@ -339,13 +348,8 @@ class Package {
339348
: ''
340349
}
341350
url = "${url}";
342-
${
343-
sha1
344-
? `sha1 = "${sha1}"`
345-
: `sha256 = abort ''
346-
347-
348-
Failed to infer \`sha256\` hash of the \`${this.renderKey()}\` package source from
351+
hash = ${hash ? `"${hash}"` : `abort ''
352+
Failed to infer hash of the \`${this.renderKey()}\` package source from
349353
\`${url}\`.
350354
351355
Override \`"${this.renderKey()}".src.sha256\` attribute in order to provide this missing piece to Nix.

0 commit comments

Comments
 (0)