@pnpm/lockfile-to-pnp 1001.0.36 → 1001.0.38
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/lib/index.js +7 -2
- package/lib/index.js.map +1 -1
- package/package.json +7 -6
package/lib/index.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.lockfileToPackageRegistry = lockfileToPackageRegistry;
|
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const lockfile_utils_1 = require("@pnpm/lockfile.utils");
|
|
11
|
+
const symlink_dependency_1 = require("@pnpm/symlink-dependency");
|
|
11
12
|
const dependency_path_1 = require("@pnpm/dependency-path");
|
|
12
13
|
const pnp_1 = require("@yarnpkg/pnp");
|
|
13
14
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
@@ -67,8 +68,12 @@ function lockfileToPackageRegistry(lockfile, opts) {
|
|
|
67
68
|
packageStore = new Map();
|
|
68
69
|
packageRegistry.set(name, packageStore);
|
|
69
70
|
}
|
|
70
|
-
// Seems like this field should always contain a relative path
|
|
71
|
-
|
|
71
|
+
// Seems like this field should always contain a relative path.
|
|
72
|
+
// `name` is reconstructed from the (attacker-controllable) lockfile depPath
|
|
73
|
+
// key via `dp.parse`, which does no validation, so contain it here to keep
|
|
74
|
+
// the PnP resolver map from pointing outside the virtual store.
|
|
75
|
+
const pkgModulesDir = path_1.default.join(opts.virtualStoreDir, (0, dependency_path_1.depPathToFilename)(relDepPath, opts.virtualStoreDirMaxLength), 'node_modules');
|
|
76
|
+
let packageLocation = (0, normalize_path_1.default)(path_1.default.relative(opts.lockfileDir, (0, symlink_dependency_1.safeJoinModulesDir)(pkgModulesDir, name)));
|
|
72
77
|
if (!packageLocation.startsWith('../')) {
|
|
73
78
|
packageLocation = `./${packageLocation}`;
|
|
74
79
|
}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/lockfile-to-pnp",
|
|
3
|
-
"version": "1001.0.
|
|
3
|
+
"version": "1001.0.38",
|
|
4
4
|
"description": "Creates a Plug'n'Play file from a pnpm-lock.yaml",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -29,10 +29,11 @@
|
|
|
29
29
|
"@yarnpkg/pnp": "4.0.8",
|
|
30
30
|
"normalize-path": "^3.0.0",
|
|
31
31
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
32
|
-
"@pnpm/dependency-path": "1001.1.
|
|
33
|
-
"@pnpm/
|
|
34
|
-
"@pnpm/
|
|
35
|
-
"@pnpm/lockfile.utils": "1004.0.
|
|
32
|
+
"@pnpm/dependency-path": "1001.1.11",
|
|
33
|
+
"@pnpm/types": "1001.3.1",
|
|
34
|
+
"@pnpm/symlink-dependency": "1000.0.20",
|
|
35
|
+
"@pnpm/lockfile.utils": "1004.0.6",
|
|
36
|
+
"@pnpm/lockfile.fs": "1001.1.35"
|
|
36
37
|
},
|
|
37
38
|
"peerDependencies": {
|
|
38
39
|
"@pnpm/logger": "^1001.0.1"
|
|
@@ -40,7 +41,7 @@
|
|
|
40
41
|
"devDependencies": {
|
|
41
42
|
"@types/normalize-path": "^3.0.2",
|
|
42
43
|
"@types/ramda": "0.29.12",
|
|
43
|
-
"@pnpm/lockfile-to-pnp": "1001.0.
|
|
44
|
+
"@pnpm/lockfile-to-pnp": "1001.0.38",
|
|
44
45
|
"@pnpm/logger": "1001.0.1"
|
|
45
46
|
},
|
|
46
47
|
"engines": {
|