@pnpm/lockfile.utils 1002.0.1 → 1002.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/nameVerFromPkgSnapshot.js +1 -1
- package/lib/nameVerFromPkgSnapshot.js.map +1 -1
- package/lib/packageIdFromSnapshot.js +3 -0
- package/lib/packageIdFromSnapshot.js.map +1 -1
- package/lib/pkgSnapshotToResolution.js +1 -26
- package/lib/pkgSnapshotToResolution.js.map +1 -1
- package/package.json +8 -7
|
@@ -30,7 +30,7 @@ function nameVerFromPkgSnapshot(depPath, pkgSnapshot) {
|
|
|
30
30
|
return {
|
|
31
31
|
name: pkgInfo.name,
|
|
32
32
|
peerDepGraphHash: pkgInfo.peerDepGraphHash,
|
|
33
|
-
version: pkgSnapshot.version ?? pkgInfo.version,
|
|
33
|
+
version: pkgSnapshot.version ?? pkgInfo.version ?? ('type' in pkgSnapshot.resolution && pkgSnapshot.resolution.type === 'nodeRuntime' ? depPath.replace(/^node@runtime:/, '') : undefined),
|
|
34
34
|
nonSemverVersion: pkgInfo.nonSemverVersion,
|
|
35
35
|
};
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nameVerFromPkgSnapshot.js","sourceRoot":"","sources":["../src/nameVerFromPkgSnapshot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wDAWC;AArBD,0DAA2C;AAU3C,SAAgB,sBAAsB,CACpC,OAAe,EACf,WAA4B;IAE5B,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACjC,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAc;QAC5B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,OAAO,EAAE,WAAW,CAAC,OAAO,IAAI,OAAO,CAAC,OAAiB;
|
|
1
|
+
{"version":3,"file":"nameVerFromPkgSnapshot.js","sourceRoot":"","sources":["../src/nameVerFromPkgSnapshot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wDAWC;AArBD,0DAA2C;AAU3C,SAAgB,sBAAsB,CACpC,OAAe,EACf,WAA4B;IAE5B,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACjC,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAc;QAC5B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,OAAO,EAAE,WAAW,CAAC,OAAO,IAAI,OAAO,CAAC,OAAiB,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpM,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;KAC3C,CAAA;AACH,CAAC"}
|
|
@@ -28,6 +28,9 @@ const dp = __importStar(require("@pnpm/dependency-path"));
|
|
|
28
28
|
function packageIdFromSnapshot(depPath, pkgSnapshot) {
|
|
29
29
|
if (pkgSnapshot.id)
|
|
30
30
|
return pkgSnapshot.id;
|
|
31
|
+
if (depPath.startsWith('node@runtime:')) {
|
|
32
|
+
return depPath;
|
|
33
|
+
}
|
|
31
34
|
return dp.tryGetPackageId(depPath) ?? depPath;
|
|
32
35
|
}
|
|
33
36
|
//# sourceMappingURL=packageIdFromSnapshot.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageIdFromSnapshot.js","sourceRoot":"","sources":["../src/packageIdFromSnapshot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,
|
|
1
|
+
{"version":3,"file":"packageIdFromSnapshot.js","sourceRoot":"","sources":["../src/packageIdFromSnapshot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,sDASC;AAXD,0DAA2C;AAE3C,SAAgB,qBAAqB,CACnC,OAAgB,EAChB,WAA4B;IAE5B,IAAI,WAAW,CAAC,EAAE;QAAE,OAAO,WAAW,CAAC,EAAW,CAAA;IAClD,IAAI,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QACxC,OAAO,OAA2B,CAAA;IACpC,CAAC;IACD,OAAO,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,OAAO,CAAA;AAC/C,CAAC"}
|
|
@@ -1,34 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
28
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
6
|
exports.pkgSnapshotToResolution = pkgSnapshotToResolution;
|
|
30
7
|
const url_1 = __importDefault(require("url"));
|
|
31
|
-
const dp = __importStar(require("@pnpm/dependency-path"));
|
|
32
8
|
const get_npm_tarball_url_1 = __importDefault(require("get-npm-tarball-url"));
|
|
33
9
|
const pick_fetcher_1 = require("@pnpm/pick-fetcher");
|
|
34
10
|
const nameVerFromPkgSnapshot_1 = require("./nameVerFromPkgSnapshot");
|
|
@@ -38,7 +14,7 @@ function pkgSnapshotToResolution(depPath, pkgSnapshot, registries) {
|
|
|
38
14
|
(0, pick_fetcher_1.isGitHostedPkgUrl)(pkgSnapshot.resolution.tarball ?? '')) {
|
|
39
15
|
return pkgSnapshot.resolution;
|
|
40
16
|
}
|
|
41
|
-
const { name } = (0, nameVerFromPkgSnapshot_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
|
|
17
|
+
const { name, version } = (0, nameVerFromPkgSnapshot_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
|
|
42
18
|
let registry = '';
|
|
43
19
|
if (name != null) {
|
|
44
20
|
if (name.startsWith('@')) {
|
|
@@ -60,7 +36,6 @@ function pkgSnapshotToResolution(depPath, pkgSnapshot, registries) {
|
|
|
60
36
|
tarball,
|
|
61
37
|
};
|
|
62
38
|
function getTarball(registry) {
|
|
63
|
-
const { name, version } = dp.parse(depPath);
|
|
64
39
|
if (!name || !version) {
|
|
65
40
|
throw new Error(`Couldn't get tarball URL from dependency path ${depPath}`);
|
|
66
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pkgSnapshotToResolution.js","sourceRoot":"","sources":["../src/pkgSnapshotToResolution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pkgSnapshotToResolution.js","sourceRoot":"","sources":["../src/pkgSnapshotToResolution.ts"],"names":[],"mappings":";;;;;AAQA,0DAyCC;AAjDD,8CAAqB;AAIrB,8EAAkD;AAClD,qDAAsD;AACtD,qEAAiE;AAEjE,SAAgB,uBAAuB,CACrC,OAAe,EACf,WAA4B,EAC5B,UAAsB;IAEtB,IACE,OAAO,CAAE,WAAW,CAAC,UAAgC,CAAC,IAAI,CAAC;QAC1D,WAAW,CAAC,UAAgC,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;QAC1E,IAAA,gCAAiB,EAAE,WAAW,CAAC,UAAgC,CAAC,OAAO,IAAI,EAAE,CAAC,EAC9E,CAAC;QACD,OAAO,WAAW,CAAC,UAAwB,CAAA;IAC7C,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,+CAAsB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IACtE,IAAI,QAAQ,GAAW,EAAE,CAAA;IACzB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAA;IAC/B,CAAC;IACD,IAAI,OAAgB,CAAA;IACpB,IAAI,CAAE,WAAW,CAAC,UAAgC,CAAC,OAAO,EAAE,CAAC;QAC3D,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,IAAI,aAAG,CAAC,GAAG,CAAE,WAAW,CAAC,UAAgC,CAAC,OAAO,EACzE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CACnD,CAAC,QAAQ,EAAE,CAAA;IACd,CAAC;IACD,OAAO;QACL,GAAG,WAAW,CAAC,UAAU;QACzB,OAAO;KACM,CAAA;IAEf,SAAS,UAAU,CAAE,QAAgB;QACnC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,iDAAiD,OAAO,EAAE,CAAC,CAAA;QAC7E,CAAC;QACD,OAAO,IAAA,6BAAgB,EAAC,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IACtD,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/lockfile.utils",
|
|
3
|
-
"version": "1002.0
|
|
3
|
+
"version": "1002.1.0",
|
|
4
4
|
"description": "Utils for dealing with pnpm-lock.yaml",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
"bugs": {
|
|
16
16
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
17
17
|
},
|
|
18
|
+
"type": "commonjs",
|
|
18
19
|
"main": "lib/index.js",
|
|
19
20
|
"types": "lib/index.d.ts",
|
|
20
21
|
"exports": {
|
|
@@ -27,18 +28,18 @@
|
|
|
27
28
|
"dependencies": {
|
|
28
29
|
"get-npm-tarball-url": "^2.1.0",
|
|
29
30
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
30
|
-
"@pnpm/
|
|
31
|
-
"@pnpm/
|
|
32
|
-
"@pnpm/pick-fetcher": "1000.0
|
|
33
|
-
"@pnpm/resolver-base": "1004.
|
|
34
|
-
"@pnpm/types": "1000.
|
|
31
|
+
"@pnpm/dependency-path": "1001.0.2",
|
|
32
|
+
"@pnpm/lockfile.types": "1001.1.0",
|
|
33
|
+
"@pnpm/pick-fetcher": "1000.1.0",
|
|
34
|
+
"@pnpm/resolver-base": "1004.1.0",
|
|
35
|
+
"@pnpm/types": "1000.7.0"
|
|
35
36
|
},
|
|
36
37
|
"devDependencies": {
|
|
37
38
|
"@types/ramda": "0.29.12",
|
|
38
39
|
"tempy": "^1.0.1",
|
|
39
40
|
"write-yaml-file": "^5.0.0",
|
|
40
41
|
"yaml-tag": "1.1.0",
|
|
41
|
-
"@pnpm/lockfile.utils": "1002.0
|
|
42
|
+
"@pnpm/lockfile.utils": "1002.1.0"
|
|
42
43
|
},
|
|
43
44
|
"engines": {
|
|
44
45
|
"node": ">=18.12"
|