@pnpm/lockfile.fs 1001.1.30 → 1001.1.32
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/read.js +11 -0
- package/lib/read.js.map +1 -1
- package/package.json +12 -12
package/lib/read.js
CHANGED
|
@@ -51,6 +51,9 @@ opts) {
|
|
|
51
51
|
hadConflicts: false,
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
|
+
// Skip the first YAML document if the file contains two documents (v11 format).
|
|
55
|
+
// The first document is the env lockfile; the second is the actual lockfile.
|
|
56
|
+
lockfileRawContent = extractMainDocument(lockfileRawContent);
|
|
54
57
|
let lockfile;
|
|
55
58
|
let hadConflicts;
|
|
56
59
|
try {
|
|
@@ -154,4 +157,12 @@ async function _readGitBranchLockfiles(lockfileDir, prefix, opts) {
|
|
|
154
157
|
const files = await (0, gitBranchLockfile_js_1.getGitBranchLockfileNames)(lockfileDir);
|
|
155
158
|
return Promise.all(files.map((file) => _read(path_1.default.join(lockfileDir, file), prefix, opts)));
|
|
156
159
|
}
|
|
160
|
+
function extractMainDocument(content) {
|
|
161
|
+
if (!content.startsWith('---\n'))
|
|
162
|
+
return content;
|
|
163
|
+
const sep = content.indexOf('\n---\n', '---\n'.length);
|
|
164
|
+
if (sep === -1)
|
|
165
|
+
return content;
|
|
166
|
+
return content.slice(sep + '\n---\n'.length);
|
|
167
|
+
}
|
|
157
168
|
//# sourceMappingURL=read.js.map
|
package/lib/read.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../src/read.ts"],"names":[],"mappings":";;;;;AAsBA,kDASC;AAED,sFAgBC;AAED,gDAUC;
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../src/read.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.32",
|
|
4
4
|
"description": "Read/write pnpm-lock.yaml files",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -28,24 +28,24 @@
|
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@zkochan/rimraf": "^3.0.2",
|
|
30
30
|
"comver-to-semver": "^1.0.0",
|
|
31
|
-
"js-yaml": "npm:@zkochan/js-yaml@0.0.
|
|
31
|
+
"js-yaml": "npm:@zkochan/js-yaml@0.0.11",
|
|
32
32
|
"normalize-path": "^3.0.0",
|
|
33
33
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
34
|
-
"semver": "^7.7.
|
|
34
|
+
"semver": "^7.7.4",
|
|
35
35
|
"strip-bom": "^4.0.0",
|
|
36
36
|
"write-file-atomic": "^5.0.1",
|
|
37
37
|
"@pnpm/constants": "1001.3.1",
|
|
38
|
-
"@pnpm/git-utils": "1000.0.0",
|
|
39
|
-
"@pnpm/lockfile.merger": "1001.0.19",
|
|
40
38
|
"@pnpm/dependency-path": "1001.1.10",
|
|
41
|
-
"@pnpm/
|
|
42
|
-
"@pnpm/error": "1000.0
|
|
43
|
-
"@pnpm/lockfile.
|
|
44
|
-
"@pnpm/
|
|
45
|
-
"@pnpm/
|
|
39
|
+
"@pnpm/git-utils": "1000.0.0",
|
|
40
|
+
"@pnpm/error": "1000.1.0",
|
|
41
|
+
"@pnpm/lockfile.merger": "1001.0.20",
|
|
42
|
+
"@pnpm/lockfile.types": "1002.1.0",
|
|
43
|
+
"@pnpm/lockfile.utils": "1004.0.3",
|
|
44
|
+
"@pnpm/types": "1001.3.0",
|
|
45
|
+
"@pnpm/object.key-sorting": "1000.0.1"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
|
-
"@pnpm/logger": "
|
|
48
|
+
"@pnpm/logger": "^1001.0.1"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@jest/globals": "29.7.0",
|
|
@@ -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.32",
|
|
61
61
|
"@pnpm/logger": "1001.0.1"
|
|
62
62
|
},
|
|
63
63
|
"engines": {
|