yarn-berry-deduplicate 7.0.1 → 7.0.2
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/dist/applyClusterFixes.js +5 -7
- package/dist/applyClusterFixes.js.map +1 -1
- package/dist/applyClusterFixes.test.js +67 -33
- package/dist/applyClusterFixes.test.js.map +1 -1
- package/dist/bin/yarn-berry-deduplicate.test.js +45 -44
- package/dist/bin/yarn-berry-deduplicate.test.js.map +1 -1
- package/dist/dedupeEndToEnd.test.js +36 -33
- package/dist/dedupeEndToEnd.test.js.map +1 -1
- package/dist/definitions/applyClusterFixes.d.ts +3 -2
- package/dist/definitions/applyClusterFixes.d.ts.map +1 -1
- package/dist/displayMany.test.js +15 -14
- package/dist/displayMany.test.js.map +1 -1
- package/dist/helpers/applyIdentifiedFixesToYarnLock.test.js +40 -39
- package/dist/helpers/applyIdentifiedFixesToYarnLock.test.js.map +1 -1
- package/dist/helpers/buildYarnPackagesMap.test.js +6 -8
- package/dist/helpers/buildYarnPackagesMap.test.js.map +1 -1
- package/dist/helpers/collectWorkspaces.test.js +6 -5
- package/dist/helpers/collectWorkspaces.test.js.map +1 -1
- package/dist/helpers/collectYarnDependents.test.js +23 -21
- package/dist/helpers/collectYarnDependents.test.js.map +1 -1
- package/dist/helpers/packageJsonResolutions.test.js +5 -4
- package/dist/helpers/packageJsonResolutions.test.js.map +1 -1
- package/dist/helpers/parseYarnLockPackages.test.js +12 -9
- package/dist/helpers/parseYarnLockPackages.test.js.map +1 -1
- package/dist/helpers/toLockstepGraph.test.js +7 -6
- package/dist/helpers/toLockstepGraph.test.js.map +1 -1
- package/dist/helpers/yarnDescriptor.test.js +12 -12
- package/dist/helpers/yarnDescriptor.test.js.map +1 -1
- package/dist/identifyClusterFixes.test.js +28 -28
- package/dist/identifyClusterFixes.test.js.map +1 -1
- package/dist/identifyResolutionFixes.test.js +14 -13
- package/dist/identifyResolutionFixes.test.js.map +1 -1
- package/dist/readYarnLock.test.js +5 -4
- package/dist/readYarnLock.test.js.map +1 -1
- package/package.json +4 -3
- package/src/applyClusterFixes.test.ts +91 -35
- package/src/applyClusterFixes.ts +10 -26
- package/src/bin/yarn-berry-deduplicate.test.ts +59 -48
- package/src/dedupeEndToEnd.test.ts +59 -54
- package/src/displayMany.test.ts +15 -18
- package/src/helpers/applyIdentifiedFixesToYarnLock.test.ts +67 -56
- package/src/helpers/buildYarnPackagesMap.test.ts +20 -18
- package/src/helpers/collectWorkspaces.test.ts +17 -13
- package/src/helpers/collectYarnDependents.test.ts +103 -87
- package/src/helpers/packageJsonResolutions.test.ts +10 -6
- package/src/helpers/parseYarnLockPackages.test.ts +27 -16
- package/src/helpers/toLockstepGraph.test.ts +7 -6
- package/src/helpers/yarnDescriptor.test.ts +36 -25
- package/src/identifyClusterFixes.test.ts +34 -30
- package/src/identifyResolutionFixes.test.ts +35 -27
- package/src/readYarnLock.test.ts +10 -7
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from "node:fs";
|
|
2
2
|
import { join, relative } from "node:path";
|
|
3
|
-
import { applyWorkspaceRangeEdit, captureFiles, createPackageFilter, describeSkippedClusterFix, diffDuplicates, partitionUnconditionalOverrides, planClusterApply, renderApplyPlan, restoreFiles, selectClusterFixes, shouldColorize, } from "pm-dedup-core";
|
|
3
|
+
import { applyWorkspaceRangeEdit, captureFiles, createPackageFilter, describeSkippedClusterFix, diffDuplicates, outstandingOverrides, partitionUnconditionalOverrides, planClusterApply, renderApplyPlan, restoreFiles, reuseKeys, selectClusterFixes, shouldColorize, } from "pm-dedup-core";
|
|
4
4
|
import { buildYarnPackagesMap } from "./helpers/buildYarnPackagesMap.js";
|
|
5
5
|
import { collectWorkspaces, createManifestReader, } from "./helpers/collectWorkspaces.js";
|
|
6
6
|
import { readDuplicateSnapshot } from "./helpers/duplicateSnapshot.js";
|
|
@@ -8,6 +8,7 @@ import { addResolutions } from "./helpers/packageJsonResolutions.js";
|
|
|
8
8
|
import { parseYarnLockPackages } from "./helpers/parseYarnLockPackages.js";
|
|
9
9
|
import { lockPathOf } from "./helpers/projectDir.js";
|
|
10
10
|
import { runYarn } from "./helpers/runYarn.js";
|
|
11
|
+
import { readVersionsSnapshot } from "./helpers/versionsSnapshot.js";
|
|
11
12
|
import { identifyClusterFixes } from "./identifyClusterFixes.js";
|
|
12
13
|
import { readAndParseYarnLock } from "./readYarnLock.js";
|
|
13
14
|
const issuesUrl = "https://github.com/christophehurpeau/pm-tools/issues";
|
|
@@ -36,14 +37,13 @@ const aliasOnlyRequesters = (fixes, packageName) => {
|
|
|
36
37
|
? constraints.map((constraint) => constraint.requester)
|
|
37
38
|
: [];
|
|
38
39
|
};
|
|
39
|
-
const reuseKeys = (fixes) => new Set(fixes.flatMap((fix) => fix.reuseFixes.map((reuse) => `${reuse.requesterName}>${reuse.packageName}@${reuse.to}`)));
|
|
40
40
|
export const applyClusterFixes = ({ projectDir, dryRun = false, log = console.log,
|
|
41
41
|
// `yarn install` is the only way to reach a version whose manifest the
|
|
42
42
|
// lockfile does not carry, and the only thing that cascades a family's
|
|
43
43
|
// internal pins
|
|
44
44
|
resolve = () => runYarn(["install"], { cwd: projectDir }).status,
|
|
45
45
|
// the result has to be what CI would install from the manifests alone
|
|
46
|
-
verifyFrozen = () => runYarn(["install", "--immutable"], { cwd: projectDir }).status, readFixes = defaultReadFixes, readDuplicates = readDuplicateSnapshot, filter, packageManagerResiduals, color = shouldColorize(), }) => {
|
|
46
|
+
verifyFrozen = () => runYarn(["install", "--immutable"], { cwd: projectDir }).status, readFixes = defaultReadFixes, readDuplicates = readDuplicateSnapshot, readVersions = readVersionsSnapshot, filter, packageManagerResiduals, color = shouldColorize(), }) => {
|
|
47
47
|
const packageFilter = createPackageFilter(filter);
|
|
48
48
|
const readSelectedFixes = (dir) => selectClusterFixes(readFixes(dir), packageFilter);
|
|
49
49
|
const lockPath = lockPathOf(projectDir);
|
|
@@ -135,6 +135,7 @@ verifyFrozen = () => runYarn(["install", "--immutable"], { cwd: projectDir }).st
|
|
|
135
135
|
// gone from its output once the edge points at the anchored version.
|
|
136
136
|
const readState = () => ({
|
|
137
137
|
duplicates: readDuplicates(lockPath),
|
|
138
|
+
versions: readVersions(lockPath),
|
|
138
139
|
reuses: reuseKeys(readSelectedFixes(projectDir).selected),
|
|
139
140
|
});
|
|
140
141
|
// A step keeps its edits as long as it broke nothing: a widened range often
|
|
@@ -166,10 +167,7 @@ verifyFrozen = () => runYarn(["install", "--immutable"], { cwd: projectDir }).st
|
|
|
166
167
|
const withoutOverridesSnapshot = captureFiles(touchedPaths);
|
|
167
168
|
const rootManifestBefore = withoutOverridesSnapshot.find((snapshot) => snapshot.path === rootManifestPath);
|
|
168
169
|
const remaining = readState();
|
|
169
|
-
|
|
170
|
-
// while the edge it repoints is still resolving elsewhere.
|
|
171
|
-
const outstanding = plannedOverrides.filter((override) => [...remaining.duplicates].some((resolution) => resolution.startsWith(`${override.packageName}@`)) ||
|
|
172
|
-
[...remaining.reuses].some((key) => key.endsWith(`>${override.packageName}@${override.version}`)));
|
|
170
|
+
const outstanding = outstandingOverrides(plannedOverrides, remaining);
|
|
173
171
|
// The result is only a fix if CI can install it from the manifests as they
|
|
174
172
|
// stand, resolutions removed and all.
|
|
175
173
|
const frozenFailure = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyClusterFixes.js","sourceRoot":"","sources":["../src/applyClusterFixes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"applyClusterFixes.js","sourceRoot":"","sources":["../src/applyClusterFixes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
2
2
|
import { readFileSync, writeFileSync } from "node:fs";
|
|
3
3
|
import { join } from "node:path";
|
|
4
|
+
import { afterEach, describe, it } from "node:test";
|
|
4
5
|
import { applyClusterFixes } from "./applyClusterFixes.js";
|
|
5
6
|
import { createTempProjects } from "./helpers/tempProjects.js";
|
|
6
7
|
const fix = (overrides) => ({
|
|
@@ -14,7 +15,6 @@ const fix = (overrides) => ({
|
|
|
14
15
|
excludedMembers: [],
|
|
15
16
|
anchor: null,
|
|
16
17
|
reuseFixes: [],
|
|
17
|
-
floatingMembers: [],
|
|
18
18
|
workspaceChanges: [],
|
|
19
19
|
reResolutionSet: [],
|
|
20
20
|
externalConstraints: [],
|
|
@@ -87,10 +87,10 @@ describe("applyClusterFixes", () => {
|
|
|
87
87
|
return 0;
|
|
88
88
|
},
|
|
89
89
|
});
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
90
|
+
strictEqual(outcome.status, "applied");
|
|
91
|
+
strictEqual(outcome.after.size, 0);
|
|
92
|
+
ok(read(dir, "package.json").includes('"metro": "0.87.0"'));
|
|
93
|
+
ok(!read(dir, "package.json").includes("resolutions"));
|
|
94
94
|
});
|
|
95
95
|
it("removes the resolutions again once yarn holds the result on its own", () => {
|
|
96
96
|
const dir = makeProject();
|
|
@@ -113,10 +113,44 @@ describe("applyClusterFixes", () => {
|
|
|
113
113
|
return 0;
|
|
114
114
|
},
|
|
115
115
|
});
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
116
|
+
strictEqual(outcome.status, "applied");
|
|
117
|
+
deepStrictEqual(outcome.stickyOverrides, []);
|
|
118
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
119
|
+
strictEqual(logs.some((line) => line.includes("Removing the resolutions")), true);
|
|
120
|
+
});
|
|
121
|
+
it("writes the resolution for a member nothing duplicates that holds its family apart", () => {
|
|
122
|
+
const dir = makeProject();
|
|
123
|
+
const logs = [];
|
|
124
|
+
let parentMoved = false;
|
|
125
|
+
const outcome = applyClusterFixes({
|
|
126
|
+
projectDir: dir,
|
|
127
|
+
color: false,
|
|
128
|
+
log: (message = "") => logs.push(message),
|
|
129
|
+
readFixes: () => [
|
|
130
|
+
fix({
|
|
131
|
+
applicable: true,
|
|
132
|
+
target: "2.0.0",
|
|
133
|
+
convergentMembers: ["leaf"],
|
|
134
|
+
reResolutionSet: ["parent"],
|
|
135
|
+
}),
|
|
136
|
+
],
|
|
137
|
+
readDuplicates: () => parentMoved ? snapshot() : snapshot("leaf@npm:1.0.0", "leaf@npm:2.0.0"),
|
|
138
|
+
readVersions: () => new Map([
|
|
139
|
+
["leaf", parentMoved ? ["2.0.0"] : ["1.0.0", "2.0.0"]],
|
|
140
|
+
["parent", [parentMoved ? "2.0.0" : "1.0.0"]],
|
|
141
|
+
]),
|
|
142
|
+
verifyFrozen: () => 0,
|
|
143
|
+
resolve: () => {
|
|
144
|
+
// parent pins leaf exactly: the family only merges once parent moves
|
|
145
|
+
if (read(dir, "package.json").includes('"parent": "2.0.0"')) {
|
|
146
|
+
parentMoved = true;
|
|
147
|
+
}
|
|
148
|
+
return 0;
|
|
149
|
+
},
|
|
150
|
+
});
|
|
151
|
+
strictEqual(outcome.status, "applied");
|
|
152
|
+
ok(logs.includes(' "parent": "2.0.0" (converge)'));
|
|
153
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
120
154
|
});
|
|
121
155
|
it("reverts and points at the issue tracker when a standing resolution is needed", () => {
|
|
122
156
|
const dir = makeProject();
|
|
@@ -138,10 +172,10 @@ describe("applyClusterFixes", () => {
|
|
|
138
172
|
return 0;
|
|
139
173
|
},
|
|
140
174
|
});
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
175
|
+
strictEqual(outcome.status, "reverted");
|
|
176
|
+
deepStrictEqual(outcome.stickyOverrides.map((o) => o.packageName), ["leaf"]);
|
|
177
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
178
|
+
strictEqual(logs.some((line) => line.includes("github.com/christophehurpeau")), true);
|
|
145
179
|
});
|
|
146
180
|
it("reverts when the result is not one `--immutable` accepts", () => {
|
|
147
181
|
const dir = makeProject();
|
|
@@ -159,9 +193,9 @@ describe("applyClusterFixes", () => {
|
|
|
159
193
|
return 0;
|
|
160
194
|
},
|
|
161
195
|
});
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
196
|
+
strictEqual(outcome.status, "reverted");
|
|
197
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
198
|
+
strictEqual(logs.some((line) => line.includes("--immutable")), true);
|
|
165
199
|
});
|
|
166
200
|
it("reverts everything when the re-resolution fails", () => {
|
|
167
201
|
const dir = makeProject();
|
|
@@ -174,8 +208,8 @@ describe("applyClusterFixes", () => {
|
|
|
174
208
|
verifyFrozen: () => 0,
|
|
175
209
|
resolve: () => 1,
|
|
176
210
|
});
|
|
177
|
-
|
|
178
|
-
|
|
211
|
+
strictEqual(outcome.status, "reverted");
|
|
212
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
179
213
|
});
|
|
180
214
|
// yarn resolutions are unconditional, so one the detector proposed from a
|
|
181
215
|
// single requester's range cannot be written when another requester rejects it
|
|
@@ -215,9 +249,9 @@ describe("applyClusterFixes", () => {
|
|
|
215
249
|
throw new Error("a dropped resolution must not resolve");
|
|
216
250
|
},
|
|
217
251
|
});
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
252
|
+
strictEqual(outcome.status, "nothing-to-do");
|
|
253
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
254
|
+
strictEqual(logs.some((line) => line.includes("Skipped resolution")), true);
|
|
221
255
|
});
|
|
222
256
|
const metroFamilyFix = fix({
|
|
223
257
|
...metroFix,
|
|
@@ -242,9 +276,9 @@ describe("applyClusterFixes", () => {
|
|
|
242
276
|
throw new Error("a dry run must not resolve");
|
|
243
277
|
},
|
|
244
278
|
});
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
279
|
+
strictEqual(outcome.plannedChangeCount, 0);
|
|
280
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
281
|
+
strictEqual(logs.some((line) => line.includes("metro not selected by the filter")), true);
|
|
248
282
|
});
|
|
249
283
|
it("keeps a cluster the filter selects whole", () => {
|
|
250
284
|
const dir = makeProject();
|
|
@@ -263,7 +297,7 @@ describe("applyClusterFixes", () => {
|
|
|
263
297
|
throw new Error("a dry run must not resolve");
|
|
264
298
|
},
|
|
265
299
|
});
|
|
266
|
-
|
|
300
|
+
ok(outcome.plannedChangeCount > 0);
|
|
267
301
|
});
|
|
268
302
|
it("writes nothing on a dry run", () => {
|
|
269
303
|
const dir = makeProject();
|
|
@@ -282,15 +316,15 @@ describe("applyClusterFixes", () => {
|
|
|
282
316
|
throw new Error("a dry run must not resolve");
|
|
283
317
|
},
|
|
284
318
|
});
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
319
|
+
strictEqual(outcome.status, "dry-run");
|
|
320
|
+
strictEqual(read(dir, "package.json"), manifestContent);
|
|
321
|
+
strictEqual(logs.some((line) => line.includes('"0.84.5" -> "0.87.0"')), true);
|
|
322
|
+
strictEqual(logs.some((line) => line.startsWith("Would apply:")), true);
|
|
323
|
+
ok(outcome.plannedChangeCount > 0);
|
|
290
324
|
});
|
|
291
325
|
it("reports having nothing to do when no fix is applicable", () => {
|
|
292
326
|
const dir = makeProject();
|
|
293
|
-
|
|
327
|
+
strictEqual(applyClusterFixes({
|
|
294
328
|
projectDir: dir,
|
|
295
329
|
color: false,
|
|
296
330
|
log: () => undefined,
|
|
@@ -300,7 +334,7 @@ describe("applyClusterFixes", () => {
|
|
|
300
334
|
resolve: () => {
|
|
301
335
|
throw new Error("nothing to apply must not resolve");
|
|
302
336
|
},
|
|
303
|
-
}).status
|
|
337
|
+
}).status, "nothing-to-do");
|
|
304
338
|
});
|
|
305
339
|
});
|
|
306
340
|
//# sourceMappingURL=applyClusterFixes.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyClusterFixes.test.js","sourceRoot":"","sources":["../src/applyClusterFixes.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"applyClusterFixes.test.js","sourceRoot":"","sources":["../src/applyClusterFixes.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ok, strictEqual } from "node:assert/strict";
|
|
2
2
|
import { spawnSync } from "node:child_process";
|
|
3
3
|
import { cpSync, mkdirSync, readFileSync, realpathSync } from "node:fs";
|
|
4
4
|
import { join } from "node:path";
|
|
5
|
+
import { afterEach, describe, it } from "node:test";
|
|
5
6
|
import { fileURLToPath } from "node:url";
|
|
6
7
|
import { fixtureDir } from "../helpers/fixtures.js";
|
|
7
8
|
import { createTempProjects } from "../helpers/tempProjects.js";
|
|
@@ -38,17 +39,17 @@ describe("yarn-berry-deduplicate", () => {
|
|
|
38
39
|
it("rewrites the lockfile and says so", () => {
|
|
39
40
|
const dir = project("duplicated-printable-shell-command");
|
|
40
41
|
const result = runBin("yarn-berry-deduplicate", dir, ["--no-clusters"]);
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
strictEqual(result.status, 0);
|
|
43
|
+
ok(result.output.includes("Deduped 1 package, 1 copy merged:"));
|
|
44
|
+
ok(result.output.includes("printable-shell-command: 2 versions (5.0.7, 5.0.8) -> 1 version (5.0.8)"));
|
|
45
|
+
ok(result.output.includes("yarn.lock updated"));
|
|
46
|
+
ok(lockOf(dir).includes('"printable-shell-command@npm:^5.0.7, printable-shell-command@npm:^5.0.8":'));
|
|
46
47
|
});
|
|
47
48
|
it("says when there is nothing safe to dedupe", () => {
|
|
48
49
|
const dir = project("simple");
|
|
49
50
|
const result = runBin("yarn-berry-deduplicate", dir, ["--no-clusters"]);
|
|
50
|
-
|
|
51
|
-
|
|
51
|
+
strictEqual(result.status, 0);
|
|
52
|
+
ok(result.output.includes("Nothing safe to dedupe identified"));
|
|
52
53
|
});
|
|
53
54
|
describe("--dry-run", () => {
|
|
54
55
|
it("prints the plan and writes nothing", () => {
|
|
@@ -58,9 +59,9 @@ describe("yarn-berry-deduplicate", () => {
|
|
|
58
59
|
"--dry-run",
|
|
59
60
|
"--no-clusters",
|
|
60
61
|
]);
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
strictEqual(result.status, 0);
|
|
63
|
+
ok(result.output.includes("yarn.lock would be rewritten"));
|
|
64
|
+
strictEqual(lockOf(dir), before);
|
|
64
65
|
});
|
|
65
66
|
});
|
|
66
67
|
describe("--check", () => {
|
|
@@ -71,13 +72,13 @@ describe("yarn-berry-deduplicate", () => {
|
|
|
71
72
|
"--check",
|
|
72
73
|
"--no-clusters",
|
|
73
74
|
]);
|
|
74
|
-
|
|
75
|
-
|
|
75
|
+
strictEqual(result.status, 1);
|
|
76
|
+
strictEqual(lockOf(dir), before);
|
|
76
77
|
});
|
|
77
78
|
it("exits 0 when nothing would change", () => {
|
|
78
79
|
const dir = project("simple");
|
|
79
|
-
|
|
80
|
-
.status
|
|
80
|
+
strictEqual(runBin("yarn-berry-deduplicate", dir, ["--check", "--no-clusters"])
|
|
81
|
+
.status, 0);
|
|
81
82
|
});
|
|
82
83
|
});
|
|
83
84
|
describe("package filters", () => {
|
|
@@ -89,8 +90,8 @@ describe("yarn-berry-deduplicate", () => {
|
|
|
89
90
|
"--packages",
|
|
90
91
|
"lodash",
|
|
91
92
|
]);
|
|
92
|
-
|
|
93
|
-
|
|
93
|
+
strictEqual(result.status, 0);
|
|
94
|
+
strictEqual(lockOf(dir), before);
|
|
94
95
|
});
|
|
95
96
|
it("moves a package the filter selects", () => {
|
|
96
97
|
const dir = project("workspaces");
|
|
@@ -99,8 +100,8 @@ describe("yarn-berry-deduplicate", () => {
|
|
|
99
100
|
"--packages",
|
|
100
101
|
"semver",
|
|
101
102
|
]);
|
|
102
|
-
|
|
103
|
-
|
|
103
|
+
strictEqual(result.status, 0);
|
|
104
|
+
ok(result.output.includes("yarn.lock updated"));
|
|
104
105
|
});
|
|
105
106
|
});
|
|
106
107
|
describe("run from a subdirectory", () => {
|
|
@@ -111,67 +112,67 @@ describe("yarn-berry-deduplicate", () => {
|
|
|
111
112
|
const result = runBin("yarn-berry-deduplicate", nested, [
|
|
112
113
|
"--no-clusters",
|
|
113
114
|
]);
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
115
|
+
strictEqual(result.status, 0);
|
|
116
|
+
strictEqual(result.stderr.trim(), lockNotice(dir));
|
|
117
|
+
ok(lockOf(dir).includes('"printable-shell-command@npm:^5.0.7, printable-shell-command@npm:^5.0.8":'));
|
|
117
118
|
});
|
|
118
119
|
it("names the lockfile it could not find and exits 1", () => {
|
|
119
120
|
const dir = projects.create();
|
|
120
121
|
const result = runBin("yarn-berry-deduplicate", dir, ["--no-clusters"]);
|
|
121
|
-
|
|
122
|
-
|
|
122
|
+
strictEqual(result.status, 1);
|
|
123
|
+
strictEqual(result.stderr.trim(), `No yarn.lock found in ${realpathSync(dir)} or any parent directory`);
|
|
123
124
|
});
|
|
124
125
|
});
|
|
125
126
|
it("prints usage for --help and exits 0", () => {
|
|
126
127
|
const dir = project("simple");
|
|
127
128
|
const result = runBin("yarn-berry-deduplicate", dir, ["--help"]);
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
129
|
+
strictEqual(result.status, 0);
|
|
130
|
+
ok(result.output.includes("Usage: yarn-berry-deduplicate"));
|
|
131
|
+
ok(result.output.includes("--check"));
|
|
131
132
|
});
|
|
132
133
|
it("rejects an unknown flag", () => {
|
|
133
134
|
const dir = project("simple");
|
|
134
135
|
const result = runBin("yarn-berry-deduplicate", dir, ["--strategy=fewer"]);
|
|
135
|
-
|
|
136
|
+
strictEqual(result.status, 1);
|
|
136
137
|
});
|
|
137
138
|
});
|
|
138
139
|
describe("yarn-berry-why-duplicate", () => {
|
|
139
140
|
it("lists one line per duplicated package", () => {
|
|
140
141
|
const dir = project("duplicated-printable-shell-command");
|
|
141
142
|
const result = runBin("yarn-berry-why-duplicate", dir, []);
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
143
|
+
strictEqual(result.status, 0);
|
|
144
|
+
ok(result.output.includes("- printable-shell-command resolved to 2 versions (5.0.8, 5.0.7)"));
|
|
145
|
+
ok(!result.output.includes("uses-psc@npm:1.0.0"));
|
|
145
146
|
});
|
|
146
147
|
it("names every dependent with --details", () => {
|
|
147
148
|
const dir = project("duplicated-printable-shell-command");
|
|
148
149
|
const result = runBin("yarn-berry-why-duplicate", dir, ["--details"]);
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
150
|
+
strictEqual(result.status, 0);
|
|
151
|
+
ok(result.output.includes("printable-shell-command — 2 versions"));
|
|
152
|
+
ok(result.output.includes("uses-psc@npm:1.0.0"));
|
|
152
153
|
});
|
|
153
154
|
it("explains one package given as a positional", () => {
|
|
154
155
|
const dir = project("workspaces");
|
|
155
156
|
const result = runBin("yarn-berry-why-duplicate", dir, ["semver"]);
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
157
|
+
strictEqual(result.status, 0);
|
|
158
|
+
ok(result.output.includes("semver"));
|
|
159
|
+
ok(!result.output.includes("lodash"));
|
|
159
160
|
});
|
|
160
161
|
it("reports from a workspace, on the project the lockfile is in", () => {
|
|
161
162
|
const dir = project("workspaces");
|
|
162
163
|
const fromRoot = runBin("yarn-berry-why-duplicate", dir, ["--details"]);
|
|
163
164
|
const fromWorkspace = runBin("yarn-berry-why-duplicate", join(dir, "packages", "app"), ["--details"]);
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
165
|
+
strictEqual(fromWorkspace.status, 0);
|
|
166
|
+
strictEqual(fromWorkspace.stdout, fromRoot.stdout);
|
|
167
|
+
strictEqual(fromWorkspace.stderr.trim(), lockNotice(dir));
|
|
168
|
+
strictEqual(fromRoot.stderr, "");
|
|
168
169
|
});
|
|
169
170
|
it("shows a lockstep family whole", () => {
|
|
170
171
|
const dir = project("duplicated-typescript-eslint");
|
|
171
172
|
const result = runBin("yarn-berry-why-duplicate", dir, ["--details"]);
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
173
|
+
strictEqual(result.status, 0);
|
|
174
|
+
ok(result.output.includes("Lockstep clusters:"));
|
|
175
|
+
ok(result.output.includes("@typescript-eslint/eslint-plugin"));
|
|
175
176
|
});
|
|
176
177
|
});
|
|
177
178
|
//# sourceMappingURL=yarn-berry-deduplicate.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn-berry-deduplicate.test.js","sourceRoot":"","sources":["../../src/bin/yarn-berry-deduplicate.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"yarn-berry-deduplicate.test.js","sourceRoot":"","sources":["../../src/bin/yarn-berry-deduplicate.test.ts"],"names":[],"mappings":"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"}
|