@pnpm/installing.linking.hoist 1100.0.14 → 1100.0.16
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 +5 -2
- package/package.json +7 -7
package/lib/index.js
CHANGED
|
@@ -172,7 +172,10 @@ function hoistGraph(depNodes, currentSpecifiers, opts) {
|
|
|
172
172
|
};
|
|
173
173
|
}
|
|
174
174
|
async function symlinkHoistedDependencies(hoistedDependenciesByNodeId, opts) {
|
|
175
|
-
const symlink = symlinkHoistedDependency.bind(null,
|
|
175
|
+
const symlink = symlinkHoistedDependency.bind(null, {
|
|
176
|
+
virtualStoreDir: opts.virtualStoreDir,
|
|
177
|
+
internalPnpmDir: path.dirname(opts.privateHoistedModulesDir),
|
|
178
|
+
});
|
|
176
179
|
const promises = [];
|
|
177
180
|
for (const [hoistedDepNodeId, pkgAliases] of hoistedDependenciesByNodeId.entries()) {
|
|
178
181
|
promises.push((async () => {
|
|
@@ -221,7 +224,7 @@ async function symlinkHoistedDependency(opts, depLocation, dest) {
|
|
|
221
224
|
});
|
|
222
225
|
return;
|
|
223
226
|
}
|
|
224
|
-
if (!isSubdir(opts.virtualStoreDir, existingSymlink)) {
|
|
227
|
+
if (!isSubdir(opts.virtualStoreDir, existingSymlink) && !isSubdir(opts.internalPnpmDir, existingSymlink)) {
|
|
225
228
|
hoistLogger.debug({
|
|
226
229
|
skipped: dest,
|
|
227
230
|
existingSymlink,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/installing.linking.hoist",
|
|
3
|
-
"version": "1100.0.
|
|
3
|
+
"version": "1100.0.16",
|
|
4
4
|
"description": "Hoists dependencies in a node_modules created by pnpm",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -10,9 +10,9 @@
|
|
|
10
10
|
"funding": "https://opencollective.com/pnpm",
|
|
11
11
|
"repository": {
|
|
12
12
|
"type": "git",
|
|
13
|
-
"url": "https://github.com/pnpm/pnpm/tree/main/installing/linking/hoist"
|
|
13
|
+
"url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/linking/hoist"
|
|
14
14
|
},
|
|
15
|
-
"homepage": "https://github.com/pnpm/pnpm/tree/main/installing/linking/hoist#readme",
|
|
15
|
+
"homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/linking/hoist#readme",
|
|
16
16
|
"bugs": {
|
|
17
17
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
18
18
|
},
|
|
@@ -36,17 +36,17 @@
|
|
|
36
36
|
"resolve-link-target": "^3.0.0",
|
|
37
37
|
"symlink-dir": "^10.0.1",
|
|
38
38
|
"@pnpm/config.matcher": "1100.0.1",
|
|
39
|
-
"@pnpm/bins.linker": "1100.0.14",
|
|
40
39
|
"@pnpm/constants": "1100.0.0",
|
|
41
|
-
"@pnpm/
|
|
42
|
-
"@pnpm/
|
|
40
|
+
"@pnpm/core-loggers": "1100.2.1",
|
|
41
|
+
"@pnpm/bins.linker": "1100.0.16",
|
|
42
|
+
"@pnpm/types": "1101.3.2"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
45
45
|
"@pnpm/logger": "^1100.0.0"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
48
|
"@types/ramda": "0.31.1",
|
|
49
|
-
"@pnpm/installing.linking.hoist": "1100.0.
|
|
49
|
+
"@pnpm/installing.linking.hoist": "1100.0.16",
|
|
50
50
|
"@pnpm/logger": "1100.0.0"
|
|
51
51
|
},
|
|
52
52
|
"engines": {
|