@pnpm/deps.graph-builder 1002.3.15 → 1002.3.17
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.
|
@@ -34,6 +34,7 @@ const lockfile_utils_1 = require("@pnpm/lockfile.utils");
|
|
|
34
34
|
const logger_1 = require("@pnpm/logger");
|
|
35
35
|
const package_is_installable_1 = require("@pnpm/package-is-installable");
|
|
36
36
|
const patching_config_1 = require("@pnpm/patching.config");
|
|
37
|
+
const symlink_dependency_1 = require("@pnpm/symlink-dependency");
|
|
37
38
|
const dp = __importStar(require("@pnpm/dependency-path"));
|
|
38
39
|
const path_exists_1 = __importDefault(require("path-exists"));
|
|
39
40
|
const equals_1 = __importDefault(require("ramda/src/equals"));
|
|
@@ -131,7 +132,11 @@ async function buildGraphFromPackages(lockfile, currentLockfile, opts) {
|
|
|
131
132
|
(0, equals_1.default)(currentPackages[depPath].dependencies, pkgSnapshot.dependencies);
|
|
132
133
|
const depIntegrityIsUnchanged = isIntegrityEqual(pkgSnapshot.resolution, currentPackages[depPath]?.resolution);
|
|
133
134
|
const modules = path_1.default.join(opts.virtualStoreDir, dirNameInVirtualStore, 'node_modules');
|
|
134
|
-
|
|
135
|
+
// `pkgName` is reconstructed from the (attacker-controllable) lockfile
|
|
136
|
+
// depPath key via `dp.parse`, which does no validation. Contain it here so
|
|
137
|
+
// a traversal name (e.g. `../../../tmp/x`) can't make the package import
|
|
138
|
+
// escape the virtual store. Mirrors the guard on the hoisted linker.
|
|
139
|
+
const dir = (0, symlink_dependency_1.safeJoinModulesDir)(modules, pkgName);
|
|
135
140
|
locationByDepPath[depPath] = dir;
|
|
136
141
|
// Track directory deps for injected workspace packages
|
|
137
142
|
if (isDirectoryDep) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfileToDepGraph.js","sourceRoot":"","sources":["../src/lockfileToDepGraph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"lockfileToDepGraph.js","sourceRoot":"","sources":["../src/lockfileToDepGraph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwHA,gDA+CC;AAvKD,gDAAuB;AACvB,+CAAiD;AACjD,qDAE2B;AAE3B,yDAG6B;AAC7B,yCAAqC;AAErC,yEAAmE;AACnE,2DAA2E;AAe3E,iEAA6D;AAC7D,0DAA2C;AAC3C,8DAAoC;AACpC,8DAAqC;AACrC,gEAAuC;AACvC,mFAA4E;AAE5E,MAAM,mBAAmB,GAAG,IAAA,eAAM,EAAC,sBAAsB,CAAC,CAAA;AA4E1D;;;;;;;;GAQG;AACI,KAAK,UAAU,kBAAkB,CACtC,QAAwB,EACxB,eAAsC,EACtC,IAA+B;IAE/B,MAAM,EACJ,KAAK,EACL,iBAAiB,EACjB,yBAAyB,GAC1B,GAAG,MAAM,sBAAsB,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;IAEjE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE;QACpD,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,KAAK;QACL,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;QAC/C,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;QACvD,iBAAiB;KACgB,CAAC,CAAA;IAEpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACpD,MAAM,OAAO,GAAG;YACd,GAAG,WAAW,CAAC,YAAY;YAC3B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/E,CAAA;QACD,MAAM,QAAQ,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACzG,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,8BAA8B,GAAmC,EAAE,CAAA;IACzE,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QACtD,MAAM,QAAQ,GAAG;YACf,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;YACxE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;SACnF,CAAA;QACD,8BAA8B,CAAC,UAAU,CAAC,GAAG,iBAAiB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;IAC5F,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,8BAA8B,EAAE,yBAAyB,EAAE,CAAA;AAC7E,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,QAAwB,EACxB,eAAsC,EACtC,IAA+B;IAM/B,MAAM,eAAe,GAAG,eAAe,EAAE,QAAQ,IAAI,EAAE,CAAA;IACvD,MAAM,KAAK,GAAsB,EAAE,CAAA;IACnC,MAAM,iBAAiB,GAA2B,EAAE,CAAA;IACpD,kEAAkE;IAClE,MAAM,yBAAyB,GAAG,IAAI,GAAG,EAAoB,CAAA;IAE7D,MAAM,aAAa,GAAG,8BAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;IACvE,MAAM,QAAQ,GAAyB,EAAE,CAAA;IACzC,MAAM,yBAAyB,GAAG,IAAA,0DAA0B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAE5E,KAAK,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,IAAI,yBAAyB,EAAE,CAAC;QAC3E,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,EAAE,kBAAkB,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;YAChG,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;gBAAE,OAAM;YAErC,MAAM,GAAG,GAAG;gBACV,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,GAAG,EAAE,WAAW,CAAC,GAAG;gBACpB,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;aACvB,CAAA;YAED,MAAM,SAAS,GAAG,IAAA,sCAAqB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAA;YAC7D,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAA,6CAAoB,EAAC,SAAS,EAAE,GAAG,EAAE;gBACtD,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,QAAQ,EAAE,WAAW,CAAC,QAAQ,KAAK,IAAI;gBACvC,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;aACpD,CAAC,KAAK,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBACzB,OAAM;YACR,CAAC;YAED,MAAM,cAAc,GAAG,WAAW,IAAI,WAAW,CAAC,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,IAAI,IAAI,CAAA;YACxG,IAAI,cAAc,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC/C,eAAM,CAAC,IAAI,CAAC;oBACV,OAAO,EAAE,6BAA6B,OAAO,IAAI,UAAU,mBAAmB;oBAC9E,MAAM,EAAE,IAAI,CAAC,WAAW;iBACzB,CAAC,CAAA;gBACF,OAAM;YACR,CAAC;YAED,MAAM,YAAY,GAAG,CAAC,cAAc;gBAClC,eAAe,CAAC,OAAO,CAAC;gBACxB,IAAA,gBAAM,EAAC,eAAe,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,CAAA;YAEzE,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,WAAW,CAAC,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAA;YAE9G,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,qBAAqB,EAAE,cAAc,CAAC,CAAA;YACtF,uEAAuE;YACvE,2EAA2E;YAC3E,yEAAyE;YACzE,qEAAqE;YACrE,MAAM,GAAG,GAAG,IAAA,uCAAkB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAChD,iBAAiB,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA;YAChC,uDAAuD;YACvD,IAAI,cAAc,EAAE,CAAC;gBACnB,yBAAyB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YAC/C,CAAC;YAED,IAAI,SAA8B,CAAA;YAClC,IACE,YAAY;gBACZ,uBAAuB;gBACvB,IAAA,iBAAO,EAAC,eAAe,CAAC,OAAO,CAAC,CAAC,oBAAoB,IAAI,EAAE,CAAC;gBAC5D,IAAA,iBAAO,EAAC,WAAW,CAAC,oBAAoB,IAAI,EAAE,CAAC;gBAC/C,CAAC,IAAI,CAAC,oBAAoB,EAC1B,CAAC;gBACD,SAAS,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;gBACjC,IAAI,SAAS;oBAAE,OAAM;gBACrB,mBAAmB,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;YAC7C,CAAC;YAED,IAAI,aAAsC,CAAA;YAC1C,IAAI,YAAY,IAAI,uBAAuB,IAAI,IAAA,gBAAM,EAAC,eAAe,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,WAAW,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACvI,IAAI,SAAS,IAAI,MAAM,IAAA,qBAAU,EAAC,GAAG,CAAC,EAAE,CAAC;oBACvC,aAAa,GAAG,EAAE,CAAA;gBACpB,CAAC;qBAAM,CAAC;oBACN,mBAAmB,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC7C,CAAC;YACH,CAAC;YAED,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,UAAU,GAAG,IAAA,wCAAuB,EAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;gBACjF,6BAAc,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;gBAEpF,IAAI,CAAC;oBACH,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC;wBACtD,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,KAAK,EAAE,KAAK;wBACZ,WAAW,EAAE,IAAI,CAAC,WAAW;wBAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE;wBACtE,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;qBACpD,CAAC,CAAA;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,WAAW,CAAC,QAAQ;wBAAE,OAAM;oBAChC,MAAM,GAAG,CAAA;gBACX,CAAC;YACH,CAAC;YAED,KAAK,CAAC,GAAG,CAAC,GAAG;gBACX,QAAQ,EAAE,EAAE;gBACZ,kBAAkB;gBAClB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,OAAO;gBACP,GAAG;gBACH,QAAQ,EAAE,aAAa,CAAC,QAAQ;gBAChC,cAAc,EAAE,aAAa,CAAC,cAAc;gBAC5C,kBAAkB,EAAE,CAAC,uBAAuB;gBAC5C,MAAM,EAAE,WAAW,CAAC,MAAM,KAAK,IAAI;gBACnC,sBAAsB,EAAE,WAAW,CAAC,mBAAmB,IAAI,IAAI;gBAC/D,OAAO;gBACP,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,UAAU;gBACnB,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ;gBAChC,oBAAoB,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;gBAClF,KAAK,EAAE,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC;aAC1C,CAAA;QACH,CAAC,CAAC,EAAE,CAAC,CAAA;IACP,CAAC;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC3B,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,CAAA;AAChE,CAAC;AAgBD,SAAS,gBAAgB,CACvB,GAA4B,EAC5B,OAAoC,EACpC,QAA4B,EAC5B,UAAkB;IAElB,MAAM,QAAQ,GAAgC,EAAE,CAAA;IAChD,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACjD,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,QAAQ,CAAC,KAAK,CAAC,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACzE,SAAQ;QACV,CAAC;QACD,MAAM,eAAe,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAE,CAAA;QACrD,IAAI,GAAG,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,CAAC;YAC3C,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAA;QAC1D,CAAC;aAAM,IAAI,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;YACtC,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,GAAG,CAAA;QAClD,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,QAAQ,CAAC,KAAK,CAAC,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/D,CAAC;aAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC7F,MAAM,IAAI,KAAK,CAAC,GAAG,eAAe,iBAAiB,2BAAe,EAAE,CAAC,CAAA;QACvE,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAE,WAAgC,EAAE,WAAgC;IAC3F,sEAAsE;IACtE,sEAAsE;IACtE,uCAAuC;IACvC,MAAM,UAAU,GAAI,WAAoD,EAAE,SAAS,CAAA;IACnF,MAAM,UAAU,GAAI,WAAoD,EAAE,SAAS,CAAA;IAEnF,OAAO,UAAU,KAAK,UAAU,CAAA;AAClC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/deps.graph-builder",
|
|
3
|
-
"version": "1002.3.
|
|
3
|
+
"version": "1002.3.17",
|
|
4
4
|
"description": "A package for building a dependency graph from a lockfile",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -26,25 +26,26 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"path-exists": "^4.0.0",
|
|
28
28
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
29
|
-
"@pnpm/calc-dep-state": "1003.0.
|
|
29
|
+
"@pnpm/calc-dep-state": "1003.0.7",
|
|
30
|
+
"@pnpm/core-loggers": "1001.0.10",
|
|
30
31
|
"@pnpm/constants": "1001.3.1",
|
|
31
|
-
"@pnpm/
|
|
32
|
-
"@pnpm/lockfile.fs": "1001.1.
|
|
33
|
-
"@pnpm/lockfile.utils": "1004.0.
|
|
34
|
-
"@pnpm/modules-yaml": "1002.0.
|
|
35
|
-
"@pnpm/
|
|
36
|
-
"@pnpm/patching.config": "1001.0.
|
|
32
|
+
"@pnpm/dependency-path": "1001.1.11",
|
|
33
|
+
"@pnpm/lockfile.fs": "1001.1.35",
|
|
34
|
+
"@pnpm/lockfile.utils": "1004.0.6",
|
|
35
|
+
"@pnpm/modules-yaml": "1002.0.2",
|
|
36
|
+
"@pnpm/package-is-installable": "1000.0.22",
|
|
37
|
+
"@pnpm/patching.config": "1001.0.20",
|
|
37
38
|
"@pnpm/patching.types": "1000.1.0",
|
|
38
|
-
"@pnpm/store-controller-types": "1004.5.
|
|
39
|
-
"@pnpm/
|
|
40
|
-
"@pnpm/types": "1001.3.
|
|
39
|
+
"@pnpm/store-controller-types": "1004.5.3",
|
|
40
|
+
"@pnpm/symlink-dependency": "1000.0.20",
|
|
41
|
+
"@pnpm/types": "1001.3.1"
|
|
41
42
|
},
|
|
42
43
|
"peerDependencies": {
|
|
43
44
|
"@pnpm/logger": "^1001.0.1"
|
|
44
45
|
},
|
|
45
46
|
"devDependencies": {
|
|
46
47
|
"@types/ramda": "0.29.12",
|
|
47
|
-
"@pnpm/deps.graph-builder": "1002.3.
|
|
48
|
+
"@pnpm/deps.graph-builder": "1002.3.17",
|
|
48
49
|
"@pnpm/logger": "1001.0.1"
|
|
49
50
|
},
|
|
50
51
|
"engines": {
|
|
@@ -54,8 +55,9 @@
|
|
|
54
55
|
"preset": "@pnpm/jest-config"
|
|
55
56
|
},
|
|
56
57
|
"scripts": {
|
|
57
|
-
"lint": "eslint \"src/**/*.ts\"",
|
|
58
|
-
"test": "pnpm run compile",
|
|
58
|
+
"lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
|
|
59
|
+
"test": "pnpm run compile && pnpm run _test",
|
|
60
|
+
"_test": "jest",
|
|
59
61
|
"compile": "tsc --build && pnpm run lint --fix"
|
|
60
62
|
}
|
|
61
63
|
}
|