yarn-berry-deduplicate 6.1.0 → 6.1.1
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.
|
@@ -14,9 +14,10 @@ export type Package = {
|
|
|
14
14
|
ignored: boolean;
|
|
15
15
|
descriptorString: string;
|
|
16
16
|
descriptor: Descriptor;
|
|
17
|
+
actualDescriptor: Descriptor;
|
|
17
18
|
satisfiedBy: Set<string>;
|
|
18
19
|
candidateVersions?: string[];
|
|
19
|
-
requestedProtocol: string;
|
|
20
|
+
requestedProtocol: string | null;
|
|
20
21
|
requestedVersion: string;
|
|
21
22
|
bestVersion?: string;
|
|
22
23
|
versions: Versions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractPackages.d.ts","sourceRoot":"","sources":["../src/extractPackages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGzD,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5C,MAAM,MAAM,OAAO,GAAG;IAClB,gBAAgB,EAAC,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"extractPackages.d.ts","sourceRoot":"","sources":["../src/extractPackages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGzD,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5C,MAAM,MAAM,OAAO,GAAG;IAClB,gBAAgB,EAAC,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;AAEjD,eAAO,MAAM,eAAe,gBACb,WAAW,wEAMrB,OAAO,KACT,QAgEF,CAAC"}
|
package/dist/extractPackages.js
CHANGED
|
@@ -4,15 +4,24 @@ exports.extractPackages = void 0;
|
|
|
4
4
|
const core_1 = require("@yarnpkg/core");
|
|
5
5
|
const extractPackages = (yarnEntries, { includeScopes = [], includePackages = [], excludePackages = [], excludeScopes = [], } = {}) => {
|
|
6
6
|
const packages = {};
|
|
7
|
-
const re = /^(?:([^:]*):)?([^@]*?)$/;
|
|
8
7
|
for (const [entryName, entry] of Object.entries(yarnEntries)) {
|
|
9
8
|
if (entryName === '__metadata')
|
|
10
9
|
continue;
|
|
11
10
|
for (const descriptorString of entryName.split(', ')) {
|
|
12
11
|
const descriptor = core_1.structUtils.parseDescriptor(descriptorString);
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
const range = core_1.structUtils.parseRange(descriptor.range);
|
|
13
|
+
// If the range is a valid descriptor we're dealing with an alias ("foo": "npm:lodash@*")
|
|
14
|
+
// and need to make the locator from that instead of the original descriptor
|
|
15
|
+
let actualDescriptor = descriptor;
|
|
16
|
+
try {
|
|
17
|
+
const potentialDescriptor = core_1.structUtils.tryParseDescriptor(range.selector, true);
|
|
18
|
+
if (potentialDescriptor) {
|
|
19
|
+
actualDescriptor = potentialDescriptor;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
catch { }
|
|
23
|
+
const packageName = core_1.structUtils.stringifyIdent(actualDescriptor);
|
|
24
|
+
let ignored = !range.protocol || !['npm', 'npm:'].includes(range.protocol) || (!!entry.linkType && entry.linkType !== 'hard');
|
|
16
25
|
// If there is a list of scopes, only process those.
|
|
17
26
|
if (includeScopes.length > 0 &&
|
|
18
27
|
!includeScopes.find((scope) => packageName.startsWith(`${scope}/`))) {
|
|
@@ -29,7 +38,7 @@ const extractPackages = (yarnEntries, { includeScopes = [], includePackages = []
|
|
|
29
38
|
else if (excludePackages.length > 0 && excludePackages.includes(packageName)) {
|
|
30
39
|
ignored = true;
|
|
31
40
|
}
|
|
32
|
-
const packageKey = ignored ? entryName : packageName + '@' +
|
|
41
|
+
const packageKey = ignored ? entryName : packageName + '@' + range.protocol;
|
|
33
42
|
packages[packageKey] = packages[packageKey] || [];
|
|
34
43
|
packages[packageKey].push({
|
|
35
44
|
packageKey,
|
|
@@ -37,9 +46,10 @@ const extractPackages = (yarnEntries, { includeScopes = [], includePackages = []
|
|
|
37
46
|
pkg: entry,
|
|
38
47
|
descriptorString,
|
|
39
48
|
descriptor,
|
|
49
|
+
actualDescriptor,
|
|
40
50
|
ignored,
|
|
41
|
-
requestedProtocol,
|
|
42
|
-
requestedVersion,
|
|
51
|
+
requestedProtocol: range.protocol,
|
|
52
|
+
requestedVersion: range.selector,
|
|
43
53
|
installedVersion: entry.version,
|
|
44
54
|
satisfiedBy: new Set(),
|
|
45
55
|
versions: new Map()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractPackages.js","sourceRoot":"","sources":["../src/extractPackages.ts"],"names":[],"mappings":";;;AAGA,wCAA4C;
|
|
1
|
+
{"version":3,"file":"extractPackages.js","sourceRoot":"","sources":["../src/extractPackages.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -39,9 +39,9 @@ const fixDuplicates = (yarnLock, options = {}) => {
|
|
|
39
39
|
const bestPackages = (0, exports.getBest)(packages, options);
|
|
40
40
|
const packageResolutions = {};
|
|
41
41
|
for (const bestPackage of bestPackages) {
|
|
42
|
-
const { descriptorString, bestVersion, requestedProtocol, installedVersion, pkg,
|
|
42
|
+
const { descriptorString, bestVersion, requestedProtocol, installedVersion, pkg, actualDescriptor, ignored, packageKey } = bestPackage;
|
|
43
43
|
const keyWithBestVersion = ignored ? packageKey : core_1.structUtils.stringifyDescriptor({
|
|
44
|
-
...
|
|
44
|
+
...actualDescriptor,
|
|
45
45
|
range: requestedProtocol + ':' + bestVersion
|
|
46
46
|
});
|
|
47
47
|
packageResolutions[keyWithBestVersion] = packageResolutions[keyWithBestVersion] || { keys: [] };
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,wCAA6C;AAC7C,yCAA2E;AAE3E,uDAAuE;AACvE,uEAA0G;AAEnG,MAAM,OAAO,GAAG,CACnB,QAAkB,EAClB,UAAmB,EAAE,EACZ,EAAE;IACX,MAAM,YAAY,GAAc,EAAE,CAAC;IAClC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;SACjB,OAAO,CACH,CAAC,IAAI,EAAE,EAAE;QACN,YAAY,CAAC,IAAI,CACb,GAAG,IAAA,iDAAuB,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CACtD,CAAC;IACN,CAAC,CACJ,CAAC;IAER,kEAAkE;IAClE,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,cAAc,EAAE;QAC5D,IAAA,+DAAqC,EAAC,YAAY,CAAC,CAAC;KACrD;IACC,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AAnBW,QAAA,OAAO,WAmBlB;AAEK,MAAM,aAAa,GAAG,CACzB,QAAkB,EAClB,UAAmB,EAAE,EACZ,EAAE;IACX,OAAO,IAAA,eAAO,EAAC,QAAQ,EAAE,OAAO,CAAC;SAC5B,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,WAAW,KAAK,gBAAgB,CAAC,CAAC;AACzF,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB;AAEK,MAAM,cAAc,GAAG,CAAC,QAAe,EAAE,UAAmB,EAAE,EAAY,EAAE;IAC/E,MAAM,WAAW,GAAG,IAAA,wBAAa,EAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,EAAE,EAAE;QAC/F,OAAO,YAAY,WAAW,WAAW,gBAAgB,kBAAkB,WAAW,aAAa,gBAAgB,EAAE,CAAC;IAC1H,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AARW,QAAA,cAAc,kBAQzB;AAEK,MAAM,aAAa,GAAG,CAAE,QAAgB,EAAE,UAAmB,EAAE,EAAG,EAAE;IACvE,MAAM,WAAW,GAAG,IAAA,wBAAa,EAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEhD,MAAM,kBAAkB,GAAuB,EAAE,CAAC;IAElD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACpC,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|