@pnpm/installing.env-installer 1102.0.3 → 1102.0.4
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/installConfigDeps.js +3 -2
- package/package.json +14 -13
package/lib/installConfigDeps.js
CHANGED
|
@@ -6,6 +6,7 @@ import { installingConfigDepsLogger, skippedOptionalDependencyLogger } from '@pn
|
|
|
6
6
|
import { calcGlobalVirtualStorePathWithSubdeps, calcLeafGlobalVirtualStorePath } from '@pnpm/deps.graph-hasher';
|
|
7
7
|
import { PnpmError } from '@pnpm/error';
|
|
8
8
|
import { readModulesDir } from '@pnpm/fs.read-modules-dir';
|
|
9
|
+
import { safeJoinModulesDir } from '@pnpm/fs.symlink-dependency';
|
|
9
10
|
import { readEnvLockfile } from '@pnpm/lockfile.fs';
|
|
10
11
|
import { getNpmTarballUrl } from '@pnpm/resolving.tarball-url';
|
|
11
12
|
import { rimraf } from '@zkochan/rimraf';
|
|
@@ -227,7 +228,7 @@ async function installOptionalSubdeps(opts) {
|
|
|
227
228
|
await Promise.all(compatibleSubdeps.map(async (subdep) => {
|
|
228
229
|
const subdepFullPkgId = `${subdep.name}@${subdep.version}:${subdep.resolution.integrity}`;
|
|
229
230
|
const subdepRelPath = calcLeafGlobalVirtualStorePath(subdepFullPkgId, subdep.name, subdep.version);
|
|
230
|
-
const subdepDirInGlobalVirtualStore = path.join(opts.globalVirtualStoreDir, subdepRelPath, 'node_modules', subdep.name);
|
|
231
|
+
const subdepDirInGlobalVirtualStore = safeJoinModulesDir(path.join(opts.globalVirtualStoreDir, subdepRelPath, 'node_modules'), subdep.name);
|
|
231
232
|
if (!fs.existsSync(path.join(subdepDirInGlobalVirtualStore, 'package.json'))) {
|
|
232
233
|
opts.reportStarted();
|
|
233
234
|
const { fetching } = await opts.store.fetchPackage({
|
|
@@ -245,7 +246,7 @@ async function installOptionalSubdeps(opts) {
|
|
|
245
246
|
filesResponse,
|
|
246
247
|
});
|
|
247
248
|
}
|
|
248
|
-
const linkPath =
|
|
249
|
+
const linkPath = safeJoinModulesDir(opts.parentNodeModulesDir, subdep.name);
|
|
249
250
|
if (await symlinkPointsTo(linkPath, subdepDirInGlobalVirtualStore)) {
|
|
250
251
|
return;
|
|
251
252
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/installing.env-installer",
|
|
3
|
-
"version": "1102.0.
|
|
3
|
+
"version": "1102.0.4",
|
|
4
4
|
"description": "Installer for configurational dependencies",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -31,28 +31,29 @@
|
|
|
31
31
|
"@zkochan/rimraf": "^4.0.0",
|
|
32
32
|
"semver": "^7.8.4",
|
|
33
33
|
"symlink-dir": "^10.0.1",
|
|
34
|
+
"@pnpm/config.package-is-installable": "1100.0.12",
|
|
34
35
|
"@pnpm/config.pick-registry-for-package": "1100.0.9",
|
|
35
36
|
"@pnpm/config.writer": "1100.0.15",
|
|
36
|
-
"@pnpm/config.package-is-installable": "1100.0.12",
|
|
37
|
-
"@pnpm/deps.graph-hasher": "1100.2.7",
|
|
38
37
|
"@pnpm/constants": "1100.0.0",
|
|
39
|
-
"@pnpm/
|
|
38
|
+
"@pnpm/deps.graph-hasher": "1100.2.8",
|
|
40
39
|
"@pnpm/error": "1100.0.1",
|
|
41
40
|
"@pnpm/fs.read-modules-dir": "1100.0.1",
|
|
42
|
-
"@pnpm/
|
|
43
|
-
"@pnpm/
|
|
41
|
+
"@pnpm/core-loggers": "1100.2.1",
|
|
42
|
+
"@pnpm/fs.symlink-dependency": "1100.0.10",
|
|
43
|
+
"@pnpm/installing.deps-resolver": "1100.2.7",
|
|
44
|
+
"@pnpm/lockfile.fs": "1100.1.9",
|
|
44
45
|
"@pnpm/lockfile.pruner": "1100.0.13",
|
|
45
46
|
"@pnpm/lockfile.types": "1100.0.13",
|
|
46
47
|
"@pnpm/lockfile.utils": "1100.1.1",
|
|
47
48
|
"@pnpm/network.auth-header": "1101.1.3",
|
|
48
49
|
"@pnpm/network.fetch": "1100.1.4",
|
|
49
50
|
"@pnpm/pkg-manifest.reader": "1100.0.9",
|
|
50
|
-
"@pnpm/resolving.npm-resolver": "1102.1.
|
|
51
|
+
"@pnpm/resolving.npm-resolver": "1102.1.2",
|
|
52
|
+
"@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
|
|
51
53
|
"@pnpm/resolving.tarball-url": "1100.0.0",
|
|
54
|
+
"@pnpm/store.controller": "1102.0.3",
|
|
52
55
|
"@pnpm/store.controller-types": "1100.1.7",
|
|
53
|
-
"@pnpm/
|
|
54
|
-
"@pnpm/types": "1101.3.2",
|
|
55
|
-
"@pnpm/store.controller": "1102.0.3"
|
|
56
|
+
"@pnpm/types": "1101.3.2"
|
|
56
57
|
},
|
|
57
58
|
"peerDependencies": {
|
|
58
59
|
"@pnpm/logger": "^1100.0.0",
|
|
@@ -63,10 +64,10 @@
|
|
|
63
64
|
"@types/semver": "7.7.1",
|
|
64
65
|
"load-json-file": "^7.0.1",
|
|
65
66
|
"read-yaml-file": "^3.0.0",
|
|
66
|
-
"@pnpm/installing.env-installer": "1102.0.
|
|
67
|
-
"@pnpm/prepare": "1100.0.18",
|
|
67
|
+
"@pnpm/installing.env-installer": "1102.0.4",
|
|
68
68
|
"@pnpm/testing.registry-mock": "1100.0.8",
|
|
69
|
-
"@pnpm/
|
|
69
|
+
"@pnpm/prepare": "1100.0.18",
|
|
70
|
+
"@pnpm/testing.temp-store": "1100.1.13"
|
|
70
71
|
},
|
|
71
72
|
"engines": {
|
|
72
73
|
"node": ">=22.13"
|