@pnpm/lockfile.fs 1001.1.32 → 1001.1.33
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.
|
@@ -13,6 +13,16 @@ const omit_1 = __importDefault(require("ramda/src/omit"));
|
|
|
13
13
|
const pickBy_1 = __importDefault(require("ramda/src/pickBy"));
|
|
14
14
|
const pick_1 = __importDefault(require("ramda/src/pick"));
|
|
15
15
|
const constants_1 = require("@pnpm/constants");
|
|
16
|
+
// Minimal duplicate of `isGitHostedPkgUrl` from `@pnpm/fetching.pick-fetcher`,
|
|
17
|
+
// inlined to avoid pulling the fetcher dep into the lockfile I/O layer. Used
|
|
18
|
+
// to enrich entries written by older pnpm versions (which didn't record the
|
|
19
|
+
// `gitHosted` field on TarballResolution) so every downstream reader can rely
|
|
20
|
+
// on the field directly.
|
|
21
|
+
function isGitHostedTarballUrl(url) {
|
|
22
|
+
return (url.startsWith('https://codeload.github.com/') ||
|
|
23
|
+
url.startsWith('https://bitbucket.org/') ||
|
|
24
|
+
url.startsWith('https://gitlab.com/')) && url.includes('tar.gz');
|
|
25
|
+
}
|
|
16
26
|
function convertToLockfileFile(lockfile) {
|
|
17
27
|
const packages = {};
|
|
18
28
|
const snapshots = {};
|
|
@@ -139,6 +149,7 @@ function convertToLockfileObject(lockfile) {
|
|
|
139
149
|
for (const [depPath, pkg] of Object.entries(lockfile.snapshots ?? {})) {
|
|
140
150
|
const pkgId = (0, dependency_path_1.removeSuffix)(depPath);
|
|
141
151
|
packages[depPath] = Object.assign(pkg, lockfile.packages?.[pkgId]);
|
|
152
|
+
enrichGitHostedFlag(packages[depPath]?.resolution);
|
|
142
153
|
}
|
|
143
154
|
return {
|
|
144
155
|
...(0, omit_1.default)(['snapshots'], rest),
|
|
@@ -146,6 +157,20 @@ function convertToLockfileObject(lockfile) {
|
|
|
146
157
|
importers: mapValues(importers ?? {}, revertProjectSnapshot),
|
|
147
158
|
};
|
|
148
159
|
}
|
|
160
|
+
// Backfill the `gitHosted` flag for tarball resolutions written by older
|
|
161
|
+
// pnpm versions. Doing it once at load time lets every downstream reader
|
|
162
|
+
// rely on the typed field instead of repeating URL prefix matches.
|
|
163
|
+
function enrichGitHostedFlag(resolution) {
|
|
164
|
+
if (resolution == null)
|
|
165
|
+
return;
|
|
166
|
+
if (resolution.type !== undefined)
|
|
167
|
+
return;
|
|
168
|
+
if (resolution.gitHosted != null)
|
|
169
|
+
return;
|
|
170
|
+
if (resolution.tarball != null && isGitHostedTarballUrl(resolution.tarball)) {
|
|
171
|
+
resolution.gitHosted = true;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
149
174
|
function convertProjectSnapshotToInlineSpecifiersFormat(projectSnapshot) {
|
|
150
175
|
const { specifiers, ...rest } = projectSnapshot;
|
|
151
176
|
if (specifiers == null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfileFormatConverters.js","sourceRoot":"","sources":["../src/lockfileFormatConverters.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"lockfileFormatConverters.js","sourceRoot":"","sources":["../src/lockfileFormatConverters.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/lockfile.fs",
|
|
3
|
-
"version": "1001.1.
|
|
3
|
+
"version": "1001.1.33",
|
|
4
4
|
"description": "Read/write pnpm-lock.yaml files",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -36,13 +36,13 @@
|
|
|
36
36
|
"write-file-atomic": "^5.0.1",
|
|
37
37
|
"@pnpm/constants": "1001.3.1",
|
|
38
38
|
"@pnpm/dependency-path": "1001.1.10",
|
|
39
|
-
"@pnpm/git-utils": "1000.0.0",
|
|
40
39
|
"@pnpm/error": "1000.1.0",
|
|
41
|
-
"@pnpm/
|
|
42
|
-
"@pnpm/lockfile.
|
|
43
|
-
"@pnpm/lockfile.
|
|
44
|
-
"@pnpm/
|
|
45
|
-
"@pnpm/object.key-sorting": "1000.0.1"
|
|
40
|
+
"@pnpm/git-utils": "1000.0.0",
|
|
41
|
+
"@pnpm/lockfile.merger": "1001.0.21",
|
|
42
|
+
"@pnpm/lockfile.types": "1002.1.1",
|
|
43
|
+
"@pnpm/lockfile.utils": "1004.0.4",
|
|
44
|
+
"@pnpm/object.key-sorting": "1000.0.1",
|
|
45
|
+
"@pnpm/types": "1001.3.0"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
48
|
"@pnpm/logger": "^1001.0.1"
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"tempy": "^1.0.1",
|
|
58
58
|
"write-yaml-file": "^5.0.0",
|
|
59
59
|
"yaml-tag": "1.1.0",
|
|
60
|
-
"@pnpm/lockfile.fs": "1001.1.
|
|
60
|
+
"@pnpm/lockfile.fs": "1001.1.33",
|
|
61
61
|
"@pnpm/logger": "1001.0.1"
|
|
62
62
|
},
|
|
63
63
|
"engines": {
|