pnpm-dedup 2.2.1 → 2.2.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/README.md +15 -5
- package/dist/applyClusterFixes.js +103 -80
- package/dist/applyClusterFixes.js.map +1 -1
- package/dist/applyClusterFixes.test.js +257 -29
- package/dist/applyClusterFixes.test.js.map +1 -1
- package/dist/bin/pnpm-why-duplicate.test.js +17 -8
- package/dist/bin/pnpm-why-duplicate.test.js.map +1 -1
- package/dist/dedupe.js +15 -4
- package/dist/dedupe.js.map +1 -1
- package/dist/dedupeCheckConsistency.test.js +53 -59
- package/dist/dedupeCheckConsistency.test.js.map +1 -1
- package/dist/dedupeEndToEnd.test.js +3 -3
- package/dist/dedupeEndToEnd.test.js.map +1 -1
- package/dist/dedupePeers.test.js +1 -1
- package/dist/dedupePeers.test.js.map +1 -1
- package/dist/definitions/applyClusterFixes.d.ts +6 -3
- package/dist/definitions/applyClusterFixes.d.ts.map +1 -1
- package/dist/definitions/dedupe.d.ts.map +1 -1
- package/dist/definitions/helpers/describeUnheldOverride.d.ts +10 -0
- package/dist/definitions/helpers/describeUnheldOverride.d.ts.map +1 -0
- package/dist/definitions/helpers/describeUnheldOverride.test.d.ts +2 -0
- package/dist/definitions/helpers/describeUnheldOverride.test.d.ts.map +1 -0
- package/dist/definitions/helpers/pnpmWorkspaceYaml.d.ts +1 -5
- package/dist/definitions/helpers/pnpmWorkspaceYaml.d.ts.map +1 -1
- package/dist/definitions/pnpmLockTypes.d.ts +1 -0
- package/dist/definitions/pnpmLockTypes.d.ts.map +1 -1
- package/dist/definitions/readPnpmLock.d.ts +7 -0
- package/dist/definitions/readPnpmLock.d.ts.map +1 -1
- package/dist/definitions/readPnpmLock.test.d.ts +2 -0
- package/dist/definitions/readPnpmLock.test.d.ts.map +1 -0
- package/dist/displayMany.test.js +3 -4
- package/dist/displayMany.test.js.map +1 -1
- package/dist/helpers/buildIdentifiedFixesMap.test.js +1 -1
- package/dist/helpers/buildIdentifiedFixesMap.test.js.map +1 -1
- package/dist/helpers/buildPnpmPackagesMap.test.js +1 -1
- package/dist/helpers/buildPnpmPackagesMap.test.js.map +1 -1
- package/dist/helpers/collectDependentRanges.test.js +1 -1
- package/dist/helpers/collectDependentRanges.test.js.map +1 -1
- package/dist/helpers/collectPnpmDependents.test.js +1 -1
- package/dist/helpers/collectPnpmDependents.test.js.map +1 -1
- package/dist/helpers/describeUnheldOverride.js +30 -0
- package/dist/helpers/describeUnheldOverride.js.map +1 -0
- package/dist/helpers/describeUnheldOverride.test.js +80 -0
- package/dist/helpers/describeUnheldOverride.test.js.map +1 -0
- package/dist/helpers/parsePnpmLockPackages.test.js +1 -1
- package/dist/helpers/parsePnpmLockPackages.test.js.map +1 -1
- package/dist/helpers/pnpmWorkspaceYaml.js +2 -17
- package/dist/helpers/pnpmWorkspaceYaml.js.map +1 -1
- package/dist/helpers/pnpmWorkspaceYaml.test.js +3 -5
- package/dist/helpers/pnpmWorkspaceYaml.test.js.map +1 -1
- package/dist/helpers/readInstalledManifest.test.js +1 -1
- package/dist/helpers/readInstalledManifest.test.js.map +1 -1
- package/dist/helpers/toLockstepGraph.test.js +1 -1
- package/dist/helpers/toLockstepGraph.test.js.map +1 -1
- package/dist/identifyClusterFixes.test.js +22 -41
- package/dist/identifyClusterFixes.test.js.map +1 -1
- package/dist/identifyResolutionFixes.test.js +8 -7
- package/dist/identifyResolutionFixes.test.js.map +1 -1
- package/dist/readPnpmLock.js +21 -2
- package/dist/readPnpmLock.js.map +1 -1
- package/dist/readPnpmLock.test.js +43 -0
- package/dist/readPnpmLock.test.js.map +1 -0
- package/package.json +4 -3
- package/src/applyClusterFixes.test.ts +398 -36
- package/src/applyClusterFixes.ts +178 -125
- package/src/bin/pnpm-why-duplicate.test.ts +31 -8
- package/src/dedupe.ts +22 -7
- package/src/dedupeCheckConsistency.test.ts +84 -100
- package/src/dedupeEndToEnd.test.ts +84 -77
- package/src/dedupePeers.test.ts +1 -1
- package/src/displayMany.test.ts +4 -4
- package/src/helpers/buildIdentifiedFixesMap.test.ts +1 -1
- package/src/helpers/buildPnpmPackagesMap.test.ts +1 -1
- package/src/helpers/collectDependentRanges.test.ts +1 -1
- package/src/helpers/collectPnpmDependents.test.ts +1 -1
- package/src/helpers/describeUnheldOverride.test.ts +100 -0
- package/src/helpers/describeUnheldOverride.ts +53 -0
- package/src/helpers/parsePnpmLockPackages.test.ts +1 -1
- package/src/helpers/pnpmWorkspaceYaml.test.ts +2 -5
- package/src/helpers/pnpmWorkspaceYaml.ts +5 -20
- package/src/helpers/readInstalledManifest.test.ts +1 -1
- package/src/helpers/toLockstepGraph.test.ts +1 -1
- package/src/identifyClusterFixes.test.ts +27 -58
- package/src/identifyResolutionFixes.test.ts +8 -7
- package/src/pnpmLockTypes.ts +1 -0
- package/src/readPnpmLock.test.ts +65 -0
- package/src/readPnpmLock.ts +26 -2
|
@@ -1,19 +1,29 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
3
2
|
import { spawnSync } from "node:child_process";
|
|
4
3
|
import { readFileSync, rmSync } from "node:fs";
|
|
5
4
|
import { join } from "node:path";
|
|
5
|
+
import { describe, it } from "node:test";
|
|
6
6
|
import { fileURLToPath } from "node:url";
|
|
7
7
|
import { buildIdentifiedFixesMap } from "pm-dedup-core";
|
|
8
8
|
import { buildPnpmPackagesMap, collectPnpmDependents, filterDuplicatesPnpmPackagesMap, parsePnpmLockPackages, readPnpmLock, } from "./index.js";
|
|
9
9
|
// These tests shell out to the real `pnpm` and require either network access or
|
|
10
|
-
// a warm pnpm store
|
|
11
|
-
//
|
|
12
|
-
//
|
|
13
|
-
//
|
|
14
|
-
//
|
|
15
|
-
//
|
|
16
|
-
|
|
10
|
+
// a warm pnpm store. `--lockfile-only` keeps pnpm from writing node_modules, and
|
|
11
|
+
// `--frozen-lockfile` / `--check` never rewrite the lockfile, so pnpm runs
|
|
12
|
+
// against the committed fixtures in place without modifying them (asserted
|
|
13
|
+
// below). The invariant is: everything `pnpm dedupe` would merge is also
|
|
14
|
+
// reported by our listing.
|
|
15
|
+
//
|
|
16
|
+
// What `dedupe` merges changes between pnpm minors, so the expectations hold for
|
|
17
|
+
// pnpm 12 only and the suite is skipped under any other major. The fixtures cannot
|
|
18
|
+
// pin it through `packageManager`: pnpm 12 records the pinned version in the
|
|
19
|
+
// lockfile, which breaks their byte-exactness.
|
|
20
|
+
const SUPPORTED_PNPM_MAJOR = 12;
|
|
21
|
+
const pnpmMajor = (() => {
|
|
22
|
+
const result = spawnSync("pnpm", ["--version"], { encoding: "utf8" });
|
|
23
|
+
if (result.status !== 0)
|
|
24
|
+
return null;
|
|
25
|
+
return Number(result.stdout.trim().split(".")[0]);
|
|
26
|
+
})();
|
|
17
27
|
const fixturePath = (scenario) => fileURLToPath(new URL(`../test/fixtures/${scenario}`, import.meta.url));
|
|
18
28
|
const runPnpm = (cwd, args) => {
|
|
19
29
|
const result = spawnSync("pnpm", [...args, "--lockfile-only", "--prefer-offline", "--ignore-scripts"], { cwd, encoding: "utf8", timeout: 120_000 });
|
|
@@ -25,18 +35,23 @@ const runPnpm = (cwd, args) => {
|
|
|
25
35
|
output: `${result.stdout}\n${result.stderr}`,
|
|
26
36
|
};
|
|
27
37
|
};
|
|
28
|
-
|
|
29
|
-
//
|
|
30
|
-
|
|
38
|
+
const withoutPeerSuffix = (version) => version.split("(")[0] ?? "";
|
|
39
|
+
// `pnpm dedupe --check` prints a tree of changes, one `├── name from → to` branch
|
|
40
|
+
// per changed dependency. A change that keeps the version only re-resolves peers,
|
|
41
|
+
// which is not a merge.
|
|
42
|
+
const parseMergedPackages = (output) => {
|
|
31
43
|
const names = new Set();
|
|
32
44
|
for (const line of output.split("\n")) {
|
|
33
45
|
if (!line.includes("→"))
|
|
34
46
|
continue;
|
|
35
|
-
const name = line
|
|
47
|
+
const [name, from, , to] = line
|
|
36
48
|
.replace(/^[\s│├└─]+/u, "")
|
|
37
49
|
.trim()
|
|
38
|
-
.split(/\s+/u)
|
|
39
|
-
if (name
|
|
50
|
+
.split(/\s+/u);
|
|
51
|
+
if (name &&
|
|
52
|
+
from &&
|
|
53
|
+
to &&
|
|
54
|
+
withoutPeerSuffix(from) !== withoutPeerSuffix(to)) {
|
|
40
55
|
names.add(name);
|
|
41
56
|
}
|
|
42
57
|
}
|
|
@@ -60,53 +75,30 @@ const assertPristine = (dir, lockBefore) => {
|
|
|
60
75
|
strictEqual(lockContent(dir), lockBefore, "pnpm must not change the lockfile");
|
|
61
76
|
rmSync(join(dir, "node_modules"), { recursive: true, force: true });
|
|
62
77
|
};
|
|
63
|
-
const suite =
|
|
78
|
+
const suite = pnpmMajor === SUPPORTED_PNPM_MAJOR ? describe : describe.skip;
|
|
64
79
|
suite("pnpm dedupe --check vs listDuplicates", () => {
|
|
65
|
-
//
|
|
66
|
-
//
|
|
67
|
-
//
|
|
68
|
-
|
|
80
|
+
// pnpm merges none of these duplicates, yet listDuplicates reports each one.
|
|
81
|
+
// In the `duplicated-typescript-eslint*` fixtures (`-dedupe-peers` is the same
|
|
82
|
+
// dependency with `dedupePeers: true`, which flattens the peer suffixes) pnpm
|
|
83
|
+
// re-resolves `@pob/eslint-config`'s auto-installed `eslint` peer to 9.39.5,
|
|
84
|
+
// the newest version that also satisfies eslint-plugin-react, and leaves the
|
|
85
|
+
// @typescript-eslint packages duplicated; pnpm 11.26 still merged them.
|
|
86
|
+
// The `mergeable-alias*` fixtures go one step further: every declared range
|
|
87
|
+
// accepts the aliased 5.0.7 pin, so we do identify a merge target — one pnpm
|
|
88
|
+
// will never apply, because merging means downgrading the range from 5.3.1.
|
|
89
|
+
// `wildcard-not-reused` is the widest case: a `*` range resolved to 0.87.0
|
|
90
|
+
// instead of the installed 0.84.5, duplicating the metro family (see
|
|
91
|
+
// wildcardNotReused.test.ts). pnpm will not undo it either; it only re-resolves
|
|
92
|
+
// the optional `supports-color` peer of metro-symbolicate.
|
|
93
|
+
const scenarios = [
|
|
69
94
|
{
|
|
70
95
|
scenario: "duplicated-typescript-eslint",
|
|
71
|
-
|
|
72
|
-
"@typescript-eslint/tsconfig-utils",
|
|
73
|
-
"@typescript-eslint/types",
|
|
74
|
-
],
|
|
96
|
+
expectedDuplicate: "@typescript-eslint/types",
|
|
75
97
|
},
|
|
76
98
|
{
|
|
77
99
|
scenario: "duplicated-typescript-eslint-dedupe-peers",
|
|
78
|
-
|
|
79
|
-
"@typescript-eslint/tsconfig-utils",
|
|
80
|
-
"@typescript-eslint/types",
|
|
81
|
-
],
|
|
100
|
+
expectedDuplicate: "@typescript-eslint/types",
|
|
82
101
|
},
|
|
83
|
-
];
|
|
84
|
-
for (const { scenario, expectedFlagged } of mergeable) {
|
|
85
|
-
it(`flags the mergeable subset of ${scenario}, all of which listDuplicates reports`, () => {
|
|
86
|
-
const dir = fixturePath(scenario);
|
|
87
|
-
const lockBefore = lockContent(dir);
|
|
88
|
-
const install = runPnpm(dir, ["install", "--frozen-lockfile"]);
|
|
89
|
-
strictEqual(install.status, 0, install.output);
|
|
90
|
-
assertPristine(dir, lockBefore);
|
|
91
|
-
const check = runPnpm(dir, ["dedupe", "--check"]);
|
|
92
|
-
ok(check.status !== 0, `dedupe --check should flag issues\n${check.output}`);
|
|
93
|
-
assertPristine(dir, lockBefore);
|
|
94
|
-
deepStrictEqual(parseDedupedPackages(check.output), expectedFlagged);
|
|
95
|
-
const duplicates = duplicateNames(scenario);
|
|
96
|
-
for (const name of expectedFlagged) {
|
|
97
|
-
ok(duplicates.includes(name), `listDuplicates should report ${name} that pnpm dedupe flags`);
|
|
98
|
-
}
|
|
99
|
-
}, 180_000);
|
|
100
|
-
}
|
|
101
|
-
// Duplicates pnpm does not merge: `dedupe --check` exits 0 and flags nothing,
|
|
102
|
-
// yet listDuplicates still reports the duplicate. The `mergeable-alias*`
|
|
103
|
-
// fixtures go one step further: every declared range accepts the aliased
|
|
104
|
-
// 5.0.7 pin, so we do identify a merge target — one pnpm will never apply,
|
|
105
|
-
// because merging means downgrading the range from 5.3.1.
|
|
106
|
-
// `wildcard-not-reused` is the widest case: a `*` range resolved to 0.87.0
|
|
107
|
-
// instead of the installed 0.84.5, duplicating the metro family (see
|
|
108
|
-
// wildcardNotReused.test.ts). pnpm will not undo it either.
|
|
109
|
-
const unmergeableByPnpm = [
|
|
110
102
|
{
|
|
111
103
|
scenario: "duplicated-babel-frame",
|
|
112
104
|
expectedDuplicate: "@babel/code-frame",
|
|
@@ -130,20 +122,22 @@ suite("pnpm dedupe --check vs listDuplicates", () => {
|
|
|
130
122
|
expectedDuplicate: "metro-config",
|
|
131
123
|
},
|
|
132
124
|
];
|
|
133
|
-
for (const { scenario, expectedDuplicate, expectedFixTargets
|
|
134
|
-
it(`
|
|
125
|
+
for (const { scenario, expectedDuplicate, expectedFixTargets } of scenarios) {
|
|
126
|
+
it(`merges nothing in ${scenario} but still lists ${expectedDuplicate}`, { timeout: 180_000 }, () => {
|
|
135
127
|
const dir = fixturePath(scenario);
|
|
136
128
|
const lockBefore = lockContent(dir);
|
|
137
129
|
const install = runPnpm(dir, ["install", "--frozen-lockfile"]);
|
|
138
130
|
strictEqual(install.status, 0, install.output);
|
|
139
131
|
assertPristine(dir, lockBefore);
|
|
132
|
+
// exits 1 on a peer-only re-resolution too
|
|
140
133
|
const check = runPnpm(dir, ["dedupe", "--check"]);
|
|
141
|
-
|
|
134
|
+
ok(check.status === 0 ||
|
|
135
|
+
check.output.includes("ERR_PNPM_DEDUPE_CHECK_ISSUES"), check.output);
|
|
142
136
|
assertPristine(dir, lockBefore);
|
|
143
|
-
deepStrictEqual(
|
|
137
|
+
deepStrictEqual(parseMergedPackages(check.output), []);
|
|
144
138
|
ok(duplicateNames(scenario).includes(expectedDuplicate));
|
|
145
139
|
deepStrictEqual(fixTargets(scenario, expectedDuplicate), expectedFixTargets ?? []);
|
|
146
|
-
}
|
|
140
|
+
});
|
|
147
141
|
}
|
|
148
142
|
});
|
|
149
143
|
//# sourceMappingURL=dedupeCheckConsistency.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dedupeCheckConsistency.test.js","sourceRoot":"","sources":["../src/dedupeCheckConsistency.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dedupeCheckConsistency.test.js","sourceRoot":"","sources":["../src/dedupeCheckConsistency.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { afterEach, describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
3
2
|
import { spawnSync } from "node:child_process";
|
|
4
3
|
import { cpSync, existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
5
4
|
import { join } from "node:path";
|
|
5
|
+
import { afterEach, describe, it } from "node:test";
|
|
6
6
|
import { fileURLToPath } from "node:url";
|
|
7
7
|
import { buildPnpmPackagesMap } from "./helpers/buildPnpmPackagesMap.js";
|
|
8
8
|
import { readDuplicateSnapshot } from "./helpers/duplicateSnapshot.js";
|
|
@@ -66,7 +66,7 @@ const resolutionsOf = (dir, packageName) => {
|
|
|
66
66
|
};
|
|
67
67
|
const suite = pnpmAvailable ? describe : describe.skip;
|
|
68
68
|
suite("pnpm-dedupe end to end", () => {
|
|
69
|
-
it("converges the cluster and leaves pnpm holding it without an override", () => {
|
|
69
|
+
it("converges the cluster and leaves pnpm holding it without an override", { timeout: 180_000 }, () => {
|
|
70
70
|
const dir = projects.create();
|
|
71
71
|
// only the manifest: the lockfile has to be the real resolution pnpm writes
|
|
72
72
|
// here, not the trimmed one the unit-test fixture commits
|
|
@@ -116,6 +116,6 @@ suite("pnpm-dedupe end to end", () => {
|
|
|
116
116
|
const check = dedupe(dir, "--check");
|
|
117
117
|
strictEqual(check.status, 0, check.output);
|
|
118
118
|
ok(check.output.includes("Nothing to dedupe."), check.output);
|
|
119
|
-
}
|
|
119
|
+
});
|
|
120
120
|
});
|
|
121
121
|
//# sourceMappingURL=dedupeEndToEnd.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dedupeEndToEnd.test.js","sourceRoot":"","sources":["../src/dedupeEndToEnd.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dedupeEndToEnd.test.js","sourceRoot":"","sources":["../src/dedupeEndToEnd.test.ts"],"names":[],"mappings":"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"}
|
package/dist/dedupePeers.test.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { buildIdentifiedFixesMap } from "pm-dedup-core";
|
|
5
5
|
import { parsePackageId } from "./helpers/parsePnpmLockPackages.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dedupePeers.test.js","sourceRoot":"","sources":["../src/dedupePeers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dedupePeers.test.js","sourceRoot":"","sources":["../src/dedupePeers.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { ClusterFix, DuplicateSnapshot, PackageFilterOptions, PlannedOverride } from "pm-dedup-core";
|
|
2
|
-
|
|
1
|
+
import type { ClusterFix, DuplicateSnapshot, PackageFilterOptions, PlannedOverride, VersionsSnapshot } from "pm-dedup-core";
|
|
2
|
+
import type { DependentRangesMap } from "./helpers/collectDependentRanges.ts";
|
|
3
|
+
export type ClusterApplyStatus = "applied" | "dry-run" | "not-supported" | "nothing-to-do" | "reverted";
|
|
3
4
|
export interface ClusterApplyOutcome {
|
|
4
5
|
status: ClusterApplyStatus;
|
|
5
6
|
before: DuplicateSnapshot;
|
|
@@ -14,11 +15,13 @@ export interface ApplyClusterFixesOptions {
|
|
|
14
15
|
resolve?: () => number | null;
|
|
15
16
|
readFixes?: (projectDir: string) => ClusterFix[];
|
|
16
17
|
readDuplicates?: (lockPath: string) => DuplicateSnapshot;
|
|
18
|
+
readVersions?: (lockPath: string) => VersionsSnapshot;
|
|
19
|
+
readDependentRanges?: (projectDir: string, packageNames: Set<string>) => DependentRangesMap;
|
|
17
20
|
pnpmVersion?: () => string | null;
|
|
18
21
|
convergenceOverrides?: boolean;
|
|
19
22
|
filter?: PackageFilterOptions;
|
|
20
23
|
packageManagerResiduals?: string;
|
|
21
24
|
color?: boolean;
|
|
22
25
|
}
|
|
23
|
-
export declare const applyClusterFixes: ({ projectDir, dryRun, log, resolve, readFixes, readDuplicates, pnpmVersion, convergenceOverrides, filter, packageManagerResiduals, color, }: ApplyClusterFixesOptions) => ClusterApplyOutcome;
|
|
26
|
+
export declare const applyClusterFixes: ({ projectDir, dryRun, log, resolve, readFixes, readDuplicates, readVersions, readDependentRanges, pnpmVersion, convergenceOverrides, filter, packageManagerResiduals, color, }: ApplyClusterFixesOptions) => ClusterApplyOutcome;
|
|
24
27
|
//# sourceMappingURL=applyClusterFixes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyClusterFixes.d.ts","sourceRoot":"","sources":["../../src/applyClusterFixes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"applyClusterFixes.d.ts","sourceRoot":"","sources":["../../src/applyClusterFixes.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAEV,UAAU,EACV,iBAAiB,EAGjB,oBAAoB,EAEpB,eAAe,EAEf,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAmB9E,MAAM,MAAM,kBAAkB,GAC1B,SAAS,GACT,SAAS,GACT,eAAe,GACf,eAAe,GACf,UAAU,CAAC;AAEf,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,EAAE,iBAAiB,CAAC;IAEzB,eAAe,EAAE,eAAe,EAAE,CAAC;IAEnC,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAEjC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,iBAAiB,CAAC;IACzD,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,gBAAgB,CAAC;IACtD,mBAAmB,CAAC,EAAE,CACpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,KACtB,kBAAkB,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAGlC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAG/B,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAG9B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAGjC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA2CD,eAAO,MAAM,iBAAiB,mLAmB3B,wBAAwB,KAAG,mBA0W7B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dedupe.d.ts","sourceRoot":"","sources":["../../src/dedupe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dedupe.d.ts","sourceRoot":"","sources":["../../src/dedupe.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAQ1D,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAIlB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAG/B,MAAM,CAAC,EAAE,oBAAoB,CAAC;CAC/B;AA0BD;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,EACrB,IAAc,EACd,oBAA2B,EAC3B,MAAM,GACP,GAAE,aAAkB,GAAG,IAAI,CA2E3B"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { PlannedOverride } from "pm-dedup-core";
|
|
2
|
+
import type { DependentRange } from "./collectDependentRanges.ts";
|
|
3
|
+
/**
|
|
4
|
+
* Why an override did not hold, as one line per edge still resolving away from
|
|
5
|
+
* its version, the ranges that reject it first: those are what blocks the merge.
|
|
6
|
+
*
|
|
7
|
+
* Several peer contexts of one requester share a key, so lines are counted once.
|
|
8
|
+
*/
|
|
9
|
+
export declare const describeUnheldOverride: (override: PlannedOverride, dependents: DependentRange[]) => string[];
|
|
10
|
+
//# sourceMappingURL=describeUnheldOverride.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"describeUnheldOverride.d.ts","sourceRoot":"","sources":["../../../src/helpers/describeUnheldOverride.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAoBlE;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,aACvB,eAAe,cACb,cAAc,EAAE,KAC3B,MAAM,EAqBR,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"describeUnheldOverride.test.d.ts","sourceRoot":"","sources":["../../../src/helpers/describeUnheldOverride.test.ts"],"names":[],"mappings":""}
|
|
@@ -8,16 +8,12 @@
|
|
|
8
8
|
export declare const overrideKey: (packageName: string, convergence: boolean) => string;
|
|
9
9
|
export interface AddOverridesOptions {
|
|
10
10
|
convergence?: boolean;
|
|
11
|
-
comment?: string;
|
|
12
11
|
}
|
|
13
12
|
/**
|
|
14
13
|
* Add overrides to a `pnpm-workspace.yaml`, editing the document rather than
|
|
15
14
|
* reserializing it: the user's comments, key order and formatting have to
|
|
16
15
|
* survive. Pass `undefined` for a file that does not exist yet.
|
|
17
|
-
*
|
|
18
|
-
* `comment` is attached above the first entry added, not above the `overrides`
|
|
19
|
-
* key, so an existing block and whatever the user wrote about it stay untouched.
|
|
20
16
|
*/
|
|
21
|
-
export declare const addOverrides: (content: string | undefined, overrides: Map<string, string>, { convergence
|
|
17
|
+
export declare const addOverrides: (content: string | undefined, overrides: Map<string, string>, { convergence }?: AddOverridesOptions) => string;
|
|
22
18
|
export declare const readConvergenceOverrides: (content: string) => Map<string, string>;
|
|
23
19
|
//# sourceMappingURL=pnpmWorkspaceYaml.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpmWorkspaceYaml.d.ts","sourceRoot":"","sources":["../../../src/helpers/pnpmWorkspaceYaml.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,gBACT,MAAM,eACN,OAAO,KACnB,MAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"pnpmWorkspaceYaml.d.ts","sourceRoot":"","sources":["../../../src/helpers/pnpmWorkspaceYaml.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,gBACT,MAAM,eACN,OAAO,KACnB,MAAyD,CAAC;AAQ7D,MAAM,WAAW,mBAAmB;IAElC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;;GAIG;AACH,eAAO,MAAM,YAAY,YACd,MAAM,GAAG,SAAS,aAChB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,oBACN,mBAAmB,KAC1C,MAWF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,KACd,GAAG,CAAC,MAAM,EAAE,MAAM,CAYpB,CAAC"}
|
|
@@ -11,6 +11,7 @@ export interface ProjectSnapshot {
|
|
|
11
11
|
dependencies?: Record<string, PnpmImporterDependency>;
|
|
12
12
|
devDependencies?: Record<string, PnpmImporterDependency>;
|
|
13
13
|
optionalDependencies?: Record<string, PnpmImporterDependency>;
|
|
14
|
+
packageManagerDependencies?: Record<string, PnpmImporterDependency>;
|
|
14
15
|
}
|
|
15
16
|
export interface PackageMeta {
|
|
16
17
|
resolution?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpmLockTypes.d.ts","sourceRoot":"","sources":["../../src/pnpmLockTypes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACtD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACzD,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"pnpmLockTypes.d.ts","sourceRoot":"","sources":["../../src/pnpmLockTypes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACtD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACzD,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAC9D,0BAA0B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C"}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
1
|
import type { PnpmLockFile } from "./pnpmLockTypes.ts";
|
|
2
|
+
/**
|
|
3
|
+
* A project declaring `devEngines.packageManager` gets a lockfile of two YAML
|
|
4
|
+
* documents from pnpm 12: the first resolves pnpm itself
|
|
5
|
+
* (`packageManagerDependencies`, `@pnpm/exe.*`), the second is the project's.
|
|
6
|
+
* Only the project document is returned — the other one would report pnpm as a
|
|
7
|
+
* dependency of the project.
|
|
8
|
+
*/
|
|
2
9
|
export declare const readPnpmLock: (filepath: string) => PnpmLockFile;
|
|
3
10
|
//# sourceMappingURL=readPnpmLock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readPnpmLock.d.ts","sourceRoot":"","sources":["../../src/readPnpmLock.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"readPnpmLock.d.ts","sourceRoot":"","sources":["../../src/readPnpmLock.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOvD;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,aAAc,MAAM,KAAG,YAc/C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readPnpmLock.test.d.ts","sourceRoot":"","sources":["../../src/readPnpmLock.test.ts"],"names":[],"mappings":""}
|
package/dist/displayMany.test.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { ok, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { displayMany } from "./displayMany.js";
|
|
5
5
|
import { buildPnpmPackagesMap, filterDuplicatesPnpmPackagesMap, } from "./helpers/buildPnpmPackagesMap.js";
|
|
@@ -54,7 +54,6 @@ const clusterFix = (overrides = {}) => ({
|
|
|
54
54
|
excludedMembers: [],
|
|
55
55
|
anchor: null,
|
|
56
56
|
reuseFixes: [],
|
|
57
|
-
floatingMembers: [],
|
|
58
57
|
workspaceChanges: [],
|
|
59
58
|
reResolutionSet: ["metro"],
|
|
60
59
|
externalConstraints: [],
|
|
@@ -92,7 +91,7 @@ describe("displayMany", () => {
|
|
|
92
91
|
ok(output.includes(" 5.0.7"));
|
|
93
92
|
});
|
|
94
93
|
it("reports no duplicates for a clean lockfile", () => {
|
|
95
|
-
|
|
94
|
+
strictEqual(renderDuplicates("simple"), "No duplicates found\n\nFound 1 dependency, 0 duplicates, 0 dedupable.\n");
|
|
96
95
|
});
|
|
97
96
|
it("maps a cluster of one to the versions that would collapse", () => {
|
|
98
97
|
const output = renderDuplicates("duplicated-babel-frame", [singletonFix()]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayMany.test.js","sourceRoot":"","sources":["../src/displayMany.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"displayMany.test.js","sourceRoot":"","sources":["../src/displayMany.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { ok, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { buildIdentifiedFixesMap } from "pm-dedup-core";
|
|
4
4
|
describe("buildIdentifiedFixesMap", () => {
|
|
5
5
|
it("builds a map even when there are no fixes", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildIdentifiedFixesMap.test.js","sourceRoot":"","sources":["../../src/helpers/buildIdentifiedFixesMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"buildIdentifiedFixesMap.test.js","sourceRoot":"","sources":["../../src/helpers/buildIdentifiedFixesMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAIxD,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,cAAc,GAAsB;YACxC,UAAU,EAAE,WAAW;YACvB,OAAO,EAAE;gBACP,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,WAAW;gBACvB,OAAO,EAAE,OAAO;aACjB;YACD,aAAa,EAAE,CAAC,WAAW,CAAC;SAC7B,CAAC;QAEF,MAAM,UAAU,GAAgB;YAC9B,GAAG,EAAE,CAAC,cAAc,CAAC;SACtB,CAAC;QAEF,MAAM,UAAU,GAAkB,IAAI,GAAG,EAAE,CAAC;QAE5C,MAAM,GAAG,GAAG,uBAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAE5D,EAAE,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC;QACvB,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAClC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACjD,WAAW,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { readPnpmLock } from "../readPnpmLock.js";
|
|
5
5
|
import { buildPnpmPackagesMap, filterDuplicatesPnpmPackagesMap, } from "./buildPnpmPackagesMap.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildPnpmPackagesMap.test.js","sourceRoot":"","sources":["../../src/helpers/buildPnpmPackagesMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"buildPnpmPackagesMap.test.js","sourceRoot":"","sources":["../../src/helpers/buildPnpmPackagesMap.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { readPnpmLock } from "../readPnpmLock.js";
|
|
5
5
|
import { collectDependentRanges } from "./collectDependentRanges.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectDependentRanges.test.js","sourceRoot":"","sources":["../../src/helpers/collectDependentRanges.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"collectDependentRanges.test.js","sourceRoot":"","sources":["../../src/helpers/collectDependentRanges.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { describe, it } from "bun:test";
|
|
2
1
|
import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
4
|
import { readPnpmLock } from "../readPnpmLock.js";
|
|
5
5
|
import { collectPnpmDependents } from "./collectPnpmDependents.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectPnpmDependents.test.js","sourceRoot":"","sources":["../../src/helpers/collectPnpmDependents.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"collectPnpmDependents.test.js","sourceRoot":"","sources":["../../src/helpers/collectPnpmDependents.test.ts"],"names":[],"mappings":"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"}
|