@pnpm/reviewing.dependencies-hierarchy 2.0.7 → 2.0.9
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.
|
@@ -28,6 +28,7 @@ async function buildDependenciesHierarchy(projectPaths, maybeOpts) {
|
|
|
28
28
|
...modules?.registries,
|
|
29
29
|
});
|
|
30
30
|
const currentLockfile = (modules?.virtualStoreDir && await (0, lockfile_file_1.readCurrentLockfile)(modules.virtualStoreDir, { ignoreIncompatible: false })) ?? null;
|
|
31
|
+
const wantedLockfile = await (0, lockfile_file_1.readWantedLockfile)(maybeOpts.lockfileDir, { ignoreIncompatible: false });
|
|
31
32
|
const result = {};
|
|
32
33
|
if (!currentLockfile) {
|
|
33
34
|
for (const projectPath of projectPaths) {
|
|
@@ -53,7 +54,7 @@ async function buildDependenciesHierarchy(projectPaths, maybeOpts) {
|
|
|
53
54
|
(await Promise.all(projectPaths.map(async (projectPath) => {
|
|
54
55
|
return [
|
|
55
56
|
projectPath,
|
|
56
|
-
await dependenciesHierarchyForPackage(projectPath, currentLockfile, opts),
|
|
57
|
+
await dependenciesHierarchyForPackage(projectPath, currentLockfile, wantedLockfile, opts),
|
|
57
58
|
];
|
|
58
59
|
}))).forEach(([projectPath, dependenciesHierarchy]) => {
|
|
59
60
|
result[projectPath] = dependenciesHierarchy;
|
|
@@ -61,7 +62,7 @@ async function buildDependenciesHierarchy(projectPaths, maybeOpts) {
|
|
|
61
62
|
return result;
|
|
62
63
|
}
|
|
63
64
|
exports.buildDependenciesHierarchy = buildDependenciesHierarchy;
|
|
64
|
-
async function dependenciesHierarchyForPackage(projectPath, currentLockfile, opts) {
|
|
65
|
+
async function dependenciesHierarchyForPackage(projectPath, currentLockfile, wantedLockfile, opts) {
|
|
65
66
|
const importerId = (0, lockfile_file_1.getLockfileImporterId)(opts.lockfileDir, projectPath);
|
|
66
67
|
if (!currentLockfile.importers[importerId])
|
|
67
68
|
return {};
|
|
@@ -69,7 +70,6 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, opt
|
|
|
69
70
|
const savedDeps = getAllDirectDependencies(currentLockfile.importers[importerId]);
|
|
70
71
|
const allDirectDeps = await (0, read_modules_dir_1.readModulesDir)(modulesDir) ?? [];
|
|
71
72
|
const unsavedDeps = allDirectDeps.filter((directDep) => !savedDeps[directDep]);
|
|
72
|
-
const wantedLockfile = await (0, lockfile_file_1.readWantedLockfile)(opts.lockfileDir, { ignoreIncompatible: false }) ?? { packages: {} };
|
|
73
73
|
const getChildrenTree = getTree_1.getTree.bind(null, {
|
|
74
74
|
currentPackages: currentLockfile.packages ?? {},
|
|
75
75
|
importers: currentLockfile.importers,
|
|
@@ -82,7 +82,7 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, opt
|
|
|
82
82
|
registries: opts.registries,
|
|
83
83
|
search: opts.search,
|
|
84
84
|
skipped: opts.skipped,
|
|
85
|
-
wantedPackages: wantedLockfile
|
|
85
|
+
wantedPackages: wantedLockfile?.packages ?? {},
|
|
86
86
|
virtualStoreDir: opts.virtualStoreDir,
|
|
87
87
|
});
|
|
88
88
|
const parentId = { type: 'importer', importerId };
|
|
@@ -99,7 +99,7 @@ async function dependenciesHierarchyForPackage(projectPath, currentLockfile, opt
|
|
|
99
99
|
ref,
|
|
100
100
|
registries: opts.registries,
|
|
101
101
|
skipped: opts.skipped,
|
|
102
|
-
wantedPackages: wantedLockfile
|
|
102
|
+
wantedPackages: wantedLockfile?.packages ?? {},
|
|
103
103
|
virtualStoreDir: opts.virtualStoreDir,
|
|
104
104
|
});
|
|
105
105
|
let newEntry = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildDependenciesHierarchy.js","sourceRoot":"","sources":["../src/buildDependenciesHierarchy.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,uDAM4B;AAC5B,qDAAwD;AACxD,qEAAgE;AAChE,6DAAuD;AACvD,+DAAoE;AACpE,uCAA0F;AAC1F,oEAA0C;AAC1C,wEAA8C;AAC9C,8EAAmD;AAGnD,uCAAmC;AACnC,6DAAyD;AACzD,6CAAyC;AAUlC,KAAK,UAAU,0BAA0B,CAC9C,YAAsB,EACtB,SAQC;IAED,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE;QAC3B,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAA;KACpD;IACD,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAe,EAAC,cAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,CAAA;IAClH,MAAM,OAAO,GAAG,MAAM,IAAA,kCAAmB,EAAC,UAAU,CAAC,CAAA;IACrD,MAAM,UAAU,GAAG,IAAA,0CAAmB,EAAC;QACrC,GAAG,SAAS,EAAE,UAAU;QACxB,GAAG,OAAO,EAAE,UAAU;KACvB,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,eAAe,IAAI,MAAM,IAAA,mCAAmB,EAAC,OAAO,CAAC,eAAe,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"buildDependenciesHierarchy.js","sourceRoot":"","sources":["../src/buildDependenciesHierarchy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/reviewing.dependencies-hierarchy",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.9",
|
|
4
4
|
"description": "Creates a dependencies hierarchy for a symlinked `node_modules`",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -29,19 +29,19 @@
|
|
|
29
29
|
"realpath-missing": "^1.1.0",
|
|
30
30
|
"resolve-link-target": "^2.0.0",
|
|
31
31
|
"@pnpm/dependency-path": "2.1.2",
|
|
32
|
-
"@pnpm/lockfile-file": "8.1.
|
|
33
|
-
"@pnpm/lockfile-utils": "8.0.
|
|
32
|
+
"@pnpm/lockfile-file": "8.1.1",
|
|
33
|
+
"@pnpm/lockfile-utils": "8.0.2",
|
|
34
34
|
"@pnpm/modules-yaml": "12.1.1",
|
|
35
35
|
"@pnpm/normalize-registries": "5.0.1",
|
|
36
36
|
"@pnpm/read-modules-dir": "6.0.1",
|
|
37
|
-
"@pnpm/read-package-json": "8.0.
|
|
37
|
+
"@pnpm/read-package-json": "8.0.2",
|
|
38
38
|
"@pnpm/types": "9.1.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@types/normalize-path": "^3.0.0",
|
|
42
|
-
"@pnpm/constants": "7.1.
|
|
43
|
-
"@pnpm/reviewing.dependencies-hierarchy": "2.0.
|
|
44
|
-
"@pnpm/test-fixtures": "0.
|
|
42
|
+
"@pnpm/constants": "7.1.1",
|
|
43
|
+
"@pnpm/reviewing.dependencies-hierarchy": "2.0.9",
|
|
44
|
+
"@pnpm/test-fixtures": "0.1.1"
|
|
45
45
|
},
|
|
46
46
|
"funding": "https://opencollective.com/pnpm",
|
|
47
47
|
"exports": {
|