@pnpm/lockfile.fs 1001.1.3 → 1001.1.5
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/gitBranchLockfile.js +1 -0
- package/lib/gitBranchLockfile.js.map +1 -1
- package/lib/gitMergeFile.js +1 -1
- package/lib/gitMergeFile.js.map +1 -1
- package/lib/lockfileFormatConverters.js +1 -1
- package/lib/lockfileFormatConverters.js.map +1 -1
- package/lib/lockfileName.js +1 -1
- package/lib/lockfileName.js.map +1 -1
- package/package.json +37 -37
package/lib/gitBranchLockfile.js
CHANGED
|
@@ -9,6 +9,7 @@ const fs_1 = require("fs");
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
async function getGitBranchLockfileNames(lockfileDir) {
|
|
11
11
|
const files = await fs_1.promises.readdir(lockfileDir);
|
|
12
|
+
// eslint-disable-next-line regexp/no-useless-non-capturing-group
|
|
12
13
|
const gitBranchLockfileNames = files.filter(file => file.match(/^pnpm-lock.(?:.*).yaml$/));
|
|
13
14
|
return gitBranchLockfileNames;
|
|
14
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitBranchLockfile.js","sourceRoot":"","sources":["../src/gitBranchLockfile.ts"],"names":[],"mappings":";;;;;AAGA,
|
|
1
|
+
{"version":3,"file":"gitBranchLockfile.js","sourceRoot":"","sources":["../src/gitBranchLockfile.ts"],"names":[],"mappings":";;;;;AAGA,8DAKC;AAED,0DAQC;AAlBD,2BAAmC;AACnC,gDAAuB;AAEhB,KAAK,UAAU,yBAAyB,CAAE,WAAmB;IAClE,MAAM,KAAK,GAAG,MAAM,aAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAC3C,iEAAiE;IACjE,MAAM,sBAAsB,GAAa,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAA;IACpG,OAAO,sBAAsB,CAAA;AAC/B,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAAE,WAAmB;IAChE,MAAM,kBAAkB,GAAa,MAAM,yBAAyB,CAAC,WAAW,CAAC,CAAA;IACjF,MAAM,OAAO,CAAC,GAAG,CACf,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;QAClC,MAAM,QAAQ,GAAW,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QACrD,MAAM,aAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3B,CAAC,CAAC,CACH,CAAA;AACH,CAAC"}
|
package/lib/gitMergeFile.js
CHANGED
|
@@ -17,7 +17,7 @@ function autofixMergeConflicts(fileContent) {
|
|
|
17
17
|
return (0, lockfile_merger_1.mergeLockfileChanges)((0, lockfileFormatConverters_1.convertToLockfileObject)(js_yaml_1.default.load(ours)), (0, lockfileFormatConverters_1.convertToLockfileObject)(js_yaml_1.default.load(theirs)));
|
|
18
18
|
}
|
|
19
19
|
function parseMergeFile(fileContent) {
|
|
20
|
-
const lines = fileContent.split(/[\n\r]+/
|
|
20
|
+
const lines = fileContent.split(/[\n\r]+/);
|
|
21
21
|
let state = 'top';
|
|
22
22
|
const ours = [];
|
|
23
23
|
const theirs = [];
|
package/lib/gitMergeFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitMergeFile.js","sourceRoot":"","sources":["../src/gitMergeFile.ts"],"names":[],"mappings":";;;;;AAUA,sDAMC;AAoCD,wBAIC;AAvDD,2DAA4D;AAC5D,sDAA0B;AAC1B,yEAAoE;AAEpE,MAAM,qBAAqB,GAAG,SAAS,CAAA;AACvC,MAAM,kBAAkB,GAAG,SAAS,CAAA;AACpC,MAAM,qBAAqB,GAAG,SAAS,CAAA;AACvC,MAAM,mBAAmB,GAAG,SAAS,CAAA;AAErC,SAAgB,qBAAqB,CAAE,WAAmB;IACxD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;IACpD,OAAO,IAAA,sCAAoB,EACzB,IAAA,kDAAuB,EAAC,iBAAI,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC,EACxD,IAAA,kDAAuB,EAAC,iBAAI,CAAC,IAAI,CAAC,MAAM,CAAiB,CAAC,CAC3D,CAAA;AACH,CAAC;AAOD,SAAS,cAAc,CAAE,WAAmB;IAC1C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"gitMergeFile.js","sourceRoot":"","sources":["../src/gitMergeFile.ts"],"names":[],"mappings":";;;;;AAUA,sDAMC;AAoCD,wBAIC;AAvDD,2DAA4D;AAC5D,sDAA0B;AAC1B,yEAAoE;AAEpE,MAAM,qBAAqB,GAAG,SAAS,CAAA;AACvC,MAAM,kBAAkB,GAAG,SAAS,CAAA;AACpC,MAAM,qBAAqB,GAAG,SAAS,CAAA;AACvC,MAAM,mBAAmB,GAAG,SAAS,CAAA;AAErC,SAAgB,qBAAqB,CAAE,WAAmB;IACxD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC,WAAW,CAAC,CAAA;IACpD,OAAO,IAAA,sCAAoB,EACzB,IAAA,kDAAuB,EAAC,iBAAI,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC,EACxD,IAAA,kDAAuB,EAAC,iBAAI,CAAC,IAAI,CAAC,MAAM,CAAiB,CAAC,CAC3D,CAAA;AACH,CAAC;AAOD,SAAS,cAAc,CAAE,WAAmB;IAC1C,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAC1C,IAAI,KAAK,GAAyC,KAAK,CAAA;IACvD,MAAM,IAAI,GAAG,EAAE,CAAA;IACf,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAY,CAAA;QACpC,IAAI,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC3C,KAAK,GAAG,QAAQ,CAAA;YAChB,SAAQ;QACV,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACzC,KAAK,GAAG,MAAM,CAAA;YACd,SAAQ;QACV,CAAC;QACD,IAAI,IAAI,KAAK,qBAAqB,EAAE,CAAC;YACnC,KAAK,GAAG,QAAQ,CAAA;YAChB,SAAQ;QACV,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACxC,KAAK,GAAG,KAAK,CAAA;YACb,SAAQ;QACV,CAAC;QACD,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACxD,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,QAAQ;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9D,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;AAC7D,CAAC;AAED,SAAgB,MAAM,CAAE,WAAmB;IACzC,OAAO,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC;QAC9C,WAAW,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QAC3C,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAA;AAC5C,CAAC"}
|
|
@@ -128,7 +128,7 @@ function refToRelative(reference, pkgName) {
|
|
|
128
128
|
if (reference.startsWith('file:')) {
|
|
129
129
|
return reference;
|
|
130
130
|
}
|
|
131
|
-
if (!reference.includes('/') || !reference.replace(/(
|
|
131
|
+
if (!reference.includes('/') || !reference.replace(/(?:\([^)]+\))+$/, '').includes('/')) {
|
|
132
132
|
return `/${pkgName}@${reference}`;
|
|
133
133
|
}
|
|
134
134
|
return reference;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfileFormatConverters.js","sourceRoot":"","sources":["../src/lockfileFormatConverters.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lockfileFormatConverters.js","sourceRoot":"","sources":["../src/lockfileFormatConverters.ts"],"names":[],"mappings":";;;;;AAoBA,sDA2CC;AAmFD,0DAaC;AA/JD,2DAAoD;AAYpD,uCAA+D;AAC/D,gEAAuC;AACvC,wDAAsC;AACtC,0DAAiC;AACjC,8DAAqC;AACrC,0DAAiC;AACjC,+CAAkD;AAElD,SAAgB,qBAAqB,CAAE,QAAwB;IAC7D,MAAM,QAAQ,GAAwC,EAAE,CAAA;IACxD,MAAM,SAAS,GAA4C,EAAE,CAAA;IAC7D,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACrE,SAAS,CAAC,OAAO,CAAC,GAAG,IAAA,cAAI,EAAC;YACxB,cAAc;YACd,sBAAsB;YACtB,4BAA4B;YAC5B,UAAU;YACV,IAAI;SACL,EAAE,GAAG,CAAC,CAAA;QACP,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAA;QACnC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,cAAI,EAAC;gBACrB,qBAAqB;gBACrB,KAAK;gBACL,YAAY;gBACZ,SAAS;gBACT,QAAQ;gBACR,MAAM;gBACN,MAAM;gBACN,IAAI;gBACJ,kBAAkB;gBAClB,sBAAsB;gBACtB,YAAY;gBACZ,SAAS;aACV,EAAE,GAAG,CAAC,CAAA;QACT,CAAC;IACH,CAAC;IACD,MAAM,WAAW,GAAG;QAClB,GAAG,QAAQ;QACX,SAAS;QACT,QAAQ;QACR,eAAe,EAAE,4BAAgB;QACjC,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,8CAA8C,CAAC;KACzF,CAAA;IACD,IAAI,WAAW,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,EAAE,CAAC;QACxD,WAAW,CAAC,QAAQ,GAAG,IAAA,cAAI,EAAC,CAAC,sBAAsB,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC7E,CAAC;IACD,IAAI,WAAW,CAAC,QAAQ,EAAE,uBAAuB,KAAK,KAAK,EAAE,CAAC;QAC5D,OAAO,WAAW,CAAC,QAAQ,CAAC,uBAAuB,CAAA;IACrD,CAAC;IACD,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAA;AACvC,CAAC;AAED,SAAS,iBAAiB,CAAE,QAAsB;IAChD,MAAM,cAAc,GAAG;QACrB,GAAG,QAAQ;QACX,SAAS,EAAE,IAAA,aAAU,EAAC,CAAC,QAAQ,EAAE,EAAE;YACjC,MAAM,kBAAkB,GAAyC,EAAE,CAAA;YACnE,IAAI,QAAQ,CAAC,gBAAgB,IAAI,IAAI,IAAI,CAAC,IAAA,iBAAO,EAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAC7E,kBAAkB,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAA;YACjE,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,2BAAmB,EAAE,CAAC;gBAC1C,IAAI,CAAC,IAAA,iBAAO,EAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBACtC,kBAAkB,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;gBACjD,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;gBAC9B,kBAAkB,CAAC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAA;YACjE,CAAC;YACD,OAAO,kBAAiD,CAAA;QAC1D,CAAC,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC;KAC7B,CAAA;IACD,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC;QAC1E,OAAO,cAAc,CAAC,QAAQ,CAAA;IAChC,CAAC;IACD,IAAI,IAAA,iBAAO,EAAE,cAA+B,CAAC,SAAS,CAAC,IAAI,CAAE,cAA+B,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,CAAC;QAChH,OAAQ,cAA+B,CAAC,SAAS,CAAA;IACnD,CAAC;IACD,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC;QACxB,cAAc,CAAC,IAAI,GAAG,mBAAmB,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IAC1F,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1E,OAAO,cAAc,CAAC,QAAQ,CAAA;IAChC,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5E,OAAO,cAAc,CAAC,SAAS,CAAA;IACjC,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,mBAAmB,IAAI,IAAI,CAAC,IAAI,IAAA,iBAAO,EAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAChG,OAAO,cAAc,CAAC,mBAAmB,CAAA;IAC3C,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,yBAAyB,EAAE,CAAC;QAC9C,OAAO,cAAc,CAAC,yBAAyB,CAAA;IACjD,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,2BAA2B,EAAE,MAAM,EAAE,CAAC;QACxD,OAAO,cAAc,CAAC,2BAA2B,CAAA;IACnD,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACrC,OAAO,cAAc,CAAC,gBAAgB,CAAA;IACxC,CAAC;IACD,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,SAAS,mBAAmB,CAAE,IAA4B,EAAE,SAAsD;IAChH,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAA;IACtC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAChD,KAAK,MAAM,OAAO,IAAI,2BAAmB,EAAE,CAAC;YAC1C,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;gBACrE,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBAC5C,MAAM,oBAAoB,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;gBACjG,MAAM,OAAO,GAAG,aAAa,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;gBAC5D,IAAI,CAAC,OAAO;oBAAE,SAAQ;gBACtB,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAA,gBAAM,EAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAA;AAChE,CAAC;AAED,SAAS,aAAa,CACpB,SAAiB,EACjB,OAAe;IAEf,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxF,OAAO,IAAI,OAAO,IAAI,SAAS,EAAE,CAAA;IACnC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAgB,uBAAuB,CAAE,QAAsB;IAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAA;IAEvC,MAAM,QAAQ,GAAqB,EAAE,CAAA;IACrC,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,OAAO,CAAC,CAAA;QACnC,QAAQ,CAAC,OAAkB,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAC/E,CAAC;IACD,OAAO;QACL,GAAG,IAAA,cAAI,EAAC,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC;QAC5B,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,EAAE,EAAE,qBAAqB,CAAC;KAC7D,CAAA;AACH,CAAC;AAED,SAAS,8CAA8C,CACrD,eAAgC;IAEhC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,eAAe,CAAA;IAC/C,IAAI,UAAU,IAAI,IAAI;QAAE,OAAO,eAA8C,CAAA;IAC7E,MAAM,YAAY,GAAG,CAAC,KAA4B,EAAE,EAAE,CACpD,KAAK,IAAI,IAAI;QACX,CAAC,CAAC,mDAAmD,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,CAAC;QAC5E,CAAC,CAAC,KAAK,CAAA;IACX,OAAO;QACL,GAAG,IAAI;QACP,YAAY,EAAE,YAAY,CAAC,eAAe,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9D,oBAAoB,EAAE,YAAY,CAAC,eAAe,CAAC,oBAAoB,IAAI,EAAE,CAAC;QAC9E,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC,eAAe,IAAI,EAAE,CAAC;KACrE,CAAA;AACH,CAAC;AAED,SAAS,mDAAmD,CAC1D,oBAA0C,EAC1C,EAAE,UAAU,EAAwC;IAEpD,OAAO,SAAS,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAC5D,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC;QAC9B,OAAO;KACR,CAAC,CAAC,CAAA;AACL,CAAC;AAED,SAAS,qBAAqB,CAAE,IAAiC;IAC/D,MAAM,UAAU,GAAyB,EAAE,CAAA;IAE3C,SAAS,cAAc,CAAE,IAA6C;QACpE,MAAM,oBAAoB,GAAyB,EAAE,CAAA;QACrD,KAAK,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACrE,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;YACzC,IAAI,aAAa,IAAI,IAAI,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CAAC,wFAAwF,OAAO,EAAE,CAAC,CAAA;YACpH,CAAC;YAED,UAAU,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;YAC/B,oBAAoB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;QACzC,CAAC;QACD,OAAO,oBAAoB,CAAA;IAC7B,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI;QAC5C,CAAC,CAAC,IAAI,CAAC,YAAY;QACnB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACrC,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI;QAClD,CAAC,CAAC,IAAI,CAAC,eAAe;QACtB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IACxC,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,IAAI,IAAI;QAC5D,CAAC,CAAC,IAAI,CAAC,oBAAoB;QAC3B,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAE7C,OAAO;QACL,GAAG,IAAI;QACP,UAAU;QACV,YAAY;QACZ,eAAe;QACf,oBAAoB;KACrB,CAAA;AACH,CAAC;AAED,SAAS,SAAS,CAAQ,GAAsB,EAAE,MAAkC;IAClF,MAAM,MAAM,GAAsB,EAAE,CAAA;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAClC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|
package/lib/lockfileName.js
CHANGED
|
@@ -17,6 +17,6 @@ async function getWantedLockfileName(opts = { useGitBranchLockfile: false, merge
|
|
|
17
17
|
* 2. Filesystem may be case-insensitive, so we need to convert branch name to lowercase
|
|
18
18
|
*/
|
|
19
19
|
function stringifyBranchName(branchName = '') {
|
|
20
|
-
return branchName.replace(/[
|
|
20
|
+
return branchName.replace(/[^\w.-]/g, '!').toLowerCase();
|
|
21
21
|
}
|
|
22
22
|
//# sourceMappingURL=lockfileName.js.map
|
package/lib/lockfileName.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfileName.js","sourceRoot":"","sources":["../src/lockfileName.ts"],"names":[],"mappings":";;AAQA,sDAQC;AAhBD,+CAAiD;AACjD,+CAAkD;AAO3C,KAAK,UAAU,qBAAqB,CAAE,OAAqC,EAAE,oBAAoB,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE;IAC/I,IAAI,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/D,MAAM,iBAAiB,GAAG,MAAM,IAAA,4BAAgB,GAAE,CAAA;QAClD,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,2BAAe,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;QAC5F,CAAC;IACH,CAAC;IACD,OAAO,2BAAe,CAAA;AACxB,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAE,aAAqB,EAAE;IACnD,OAAO,UAAU,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"lockfileName.js","sourceRoot":"","sources":["../src/lockfileName.ts"],"names":[],"mappings":";;AAQA,sDAQC;AAhBD,+CAAiD;AACjD,+CAAkD;AAO3C,KAAK,UAAU,qBAAqB,CAAE,OAAqC,EAAE,oBAAoB,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE;IAC/I,IAAI,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/D,MAAM,iBAAiB,GAAG,MAAM,IAAA,4BAAgB,GAAE,CAAA;QAClD,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,2BAAe,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;QAC5F,CAAC;IACH,CAAC;IACD,OAAO,2BAAe,CAAA;AACxB,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAE,aAAqB,EAAE;IACnD,OAAO,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;AAC1D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,28 +1,48 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/lockfile.fs",
|
|
3
|
-
"version": "1001.1.
|
|
3
|
+
"version": "1001.1.5",
|
|
4
4
|
"description": "Read/write pnpm-lock.yaml files",
|
|
5
|
+
"keywords": [
|
|
6
|
+
"pnpm",
|
|
7
|
+
"pnpm10",
|
|
8
|
+
"lockfile",
|
|
9
|
+
"shrinkwrap"
|
|
10
|
+
],
|
|
11
|
+
"license": "MIT",
|
|
12
|
+
"funding": "https://opencollective.com/pnpm",
|
|
13
|
+
"repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/fs",
|
|
14
|
+
"homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/fs#readme",
|
|
15
|
+
"bugs": {
|
|
16
|
+
"url": "https://github.com/pnpm/pnpm/issues"
|
|
17
|
+
},
|
|
5
18
|
"main": "lib/index.js",
|
|
6
19
|
"types": "lib/index.d.ts",
|
|
7
|
-
"
|
|
8
|
-
"
|
|
20
|
+
"exports": {
|
|
21
|
+
".": "./lib/index.js"
|
|
9
22
|
},
|
|
10
23
|
"files": [
|
|
11
24
|
"lib",
|
|
12
25
|
"!*.map"
|
|
13
26
|
],
|
|
14
|
-
"
|
|
15
|
-
|
|
16
|
-
"
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
"
|
|
27
|
+
"dependencies": {
|
|
28
|
+
"@zkochan/rimraf": "^3.0.2",
|
|
29
|
+
"comver-to-semver": "^1.0.0",
|
|
30
|
+
"js-yaml": "npm:@zkochan/js-yaml@0.0.7",
|
|
31
|
+
"normalize-path": "^3.0.0",
|
|
32
|
+
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
33
|
+
"semver": "^7.7.1",
|
|
34
|
+
"strip-bom": "^4.0.0",
|
|
35
|
+
"write-file-atomic": "^5.0.1",
|
|
36
|
+
"@pnpm/dependency-path": "1000.0.4",
|
|
37
|
+
"@pnpm/constants": "1001.1.0",
|
|
38
|
+
"@pnpm/error": "1000.0.2",
|
|
39
|
+
"@pnpm/git-utils": "1000.0.0",
|
|
40
|
+
"@pnpm/lockfile.types": "1001.0.4",
|
|
41
|
+
"@pnpm/lockfile.merger": "1001.0.4",
|
|
42
|
+
"@pnpm/lockfile.utils": "1001.0.4",
|
|
43
|
+
"@pnpm/object.key-sorting": "1000.0.0",
|
|
44
|
+
"@pnpm/types": "1000.2.1"
|
|
24
45
|
},
|
|
25
|
-
"homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/fs#readme",
|
|
26
46
|
"peerDependencies": {
|
|
27
47
|
"@pnpm/logger": ">=5.1.0 <1001.0.0"
|
|
28
48
|
},
|
|
@@ -35,31 +55,11 @@
|
|
|
35
55
|
"tempy": "^1.0.1",
|
|
36
56
|
"write-yaml-file": "^5.0.0",
|
|
37
57
|
"yaml-tag": "1.1.0",
|
|
38
|
-
"@pnpm/lockfile.fs": "1001.1.
|
|
58
|
+
"@pnpm/lockfile.fs": "1001.1.5",
|
|
39
59
|
"@pnpm/logger": "1000.0.0"
|
|
40
60
|
},
|
|
41
|
-
"
|
|
42
|
-
"
|
|
43
|
-
"comver-to-semver": "^1.0.0",
|
|
44
|
-
"js-yaml": "npm:@zkochan/js-yaml@0.0.7",
|
|
45
|
-
"normalize-path": "^3.0.0",
|
|
46
|
-
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
47
|
-
"semver": "^7.6.2",
|
|
48
|
-
"strip-bom": "^4.0.0",
|
|
49
|
-
"write-file-atomic": "^5.0.1",
|
|
50
|
-
"@pnpm/constants": "1001.1.0",
|
|
51
|
-
"@pnpm/error": "1000.0.2",
|
|
52
|
-
"@pnpm/dependency-path": "1000.0.2",
|
|
53
|
-
"@pnpm/lockfile.merger": "1001.0.2",
|
|
54
|
-
"@pnpm/git-utils": "1000.0.0",
|
|
55
|
-
"@pnpm/lockfile.types": "1001.0.2",
|
|
56
|
-
"@pnpm/lockfile.utils": "1001.0.2",
|
|
57
|
-
"@pnpm/object.key-sorting": "1000.0.0",
|
|
58
|
-
"@pnpm/types": "1000.1.1"
|
|
59
|
-
},
|
|
60
|
-
"funding": "https://opencollective.com/pnpm",
|
|
61
|
-
"exports": {
|
|
62
|
-
".": "./lib/index.js"
|
|
61
|
+
"engines": {
|
|
62
|
+
"node": ">=18.12"
|
|
63
63
|
},
|
|
64
64
|
"jest": {
|
|
65
65
|
"preset": "@pnpm/jest-config"
|