@pnpm/core 7.0.0 → 7.0.1
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/link/index.js +4 -2
- package/lib/link/index.js.map +1 -1
- package/package.json +37 -37
package/lib/link/index.js
CHANGED
|
@@ -45,12 +45,13 @@ async function link(linkFromPkgs, destModules, maybeOpts) {
|
|
|
45
45
|
if (typeof linkFrom === 'string' && manifest.name === undefined) {
|
|
46
46
|
throw new error_1.PnpmError('INVALID_PACKAGE_NAME', `Package in ${linkFromPath} must have a name field to be linked`);
|
|
47
47
|
}
|
|
48
|
+
const targetDependencyType = (0, manifest_utils_1.getDependencyTypeFromManifest)(opts.manifest, manifest.name) ?? opts.targetDependenciesField;
|
|
48
49
|
specsToUpsert.push({
|
|
49
50
|
alias: manifest.name,
|
|
50
51
|
pref: (0, manifest_utils_1.getPref)(manifest.name, manifest.name, manifest.version, {
|
|
51
52
|
pinnedVersion: opts.pinnedVersion,
|
|
52
53
|
}),
|
|
53
|
-
saveType: (
|
|
54
|
+
saveType: (targetDependencyType ?? (ctx.manifest && (0, manifest_utils_1.guessDependencyType)(manifest.name, ctx.manifest))),
|
|
54
55
|
});
|
|
55
56
|
const packagePath = (0, normalize_path_1.default)(path_1.default.relative(opts.dir, linkFromPath));
|
|
56
57
|
const addLinkOpts = {
|
|
@@ -74,8 +75,9 @@ async function link(linkFromPkgs, destModules, maybeOpts) {
|
|
|
74
75
|
for (const { alias, manifest, path } of linkedPkgs) {
|
|
75
76
|
// TODO: cover with test that linking reports with correct dependency types
|
|
76
77
|
const stu = specsToUpsert.find((s) => s.alias === manifest.name);
|
|
78
|
+
const targetDependencyType = (0, manifest_utils_1.getDependencyTypeFromManifest)(opts.manifest, manifest.name) ?? opts.targetDependenciesField;
|
|
77
79
|
await (0, symlink_dependency_1.symlinkDirectRootDependency)(path, destModules, alias, {
|
|
78
|
-
fromDependenciesField: stu?.saveType ??
|
|
80
|
+
fromDependenciesField: stu?.saveType ?? targetDependencyType,
|
|
79
81
|
linkedPackage: manifest,
|
|
80
82
|
prefix: opts.dir,
|
|
81
83
|
});
|
package/lib/link/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/link/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,qDAE2B;AAC3B,uCAAuC;AACvC,mDAA+D;AAC/D,+CAAoD;AACpD,uDAK4B;AAC5B,yCAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/link/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/core",
|
|
3
3
|
"description": "Fast, disk space efficient installation engine",
|
|
4
|
-
"version": "7.0.
|
|
4
|
+
"version": "7.0.1",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
7
7
|
},
|
|
@@ -15,45 +15,45 @@
|
|
|
15
15
|
"@pnpm/logger": "^5.0.0"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@pnpm/build-modules": "10.0.
|
|
18
|
+
"@pnpm/build-modules": "10.0.1",
|
|
19
19
|
"@pnpm/calc-dep-state": "3.0.1",
|
|
20
20
|
"@pnpm/constants": "6.1.0",
|
|
21
|
-
"@pnpm/core-loggers": "8.0.
|
|
21
|
+
"@pnpm/core-loggers": "8.0.1",
|
|
22
22
|
"@pnpm/crypto.base32-hash": "1.0.1",
|
|
23
23
|
"@pnpm/error": "4.0.0",
|
|
24
|
-
"@pnpm/filter-lockfile": "7.0.
|
|
25
|
-
"@pnpm/get-context": "8.0.
|
|
24
|
+
"@pnpm/filter-lockfile": "7.0.1",
|
|
25
|
+
"@pnpm/get-context": "8.0.1",
|
|
26
26
|
"@pnpm/graph-sequencer": "1.0.0",
|
|
27
|
-
"@pnpm/headless": "19.0.
|
|
28
|
-
"@pnpm/hoist": "7.0.
|
|
29
|
-
"@pnpm/hooks.read-package-hook": "2.0.
|
|
30
|
-
"@pnpm/lifecycle": "14.0.
|
|
31
|
-
"@pnpm/link-bins": "8.0.
|
|
32
|
-
"@pnpm/lockfile-file": "6.0.
|
|
33
|
-
"@pnpm/lockfile-to-pnp": "2.0.
|
|
34
|
-
"@pnpm/lockfile-utils": "4.2.
|
|
35
|
-
"@pnpm/lockfile-walker": "6.0.
|
|
36
|
-
"@pnpm/manifest-utils": "4.
|
|
27
|
+
"@pnpm/headless": "19.0.1",
|
|
28
|
+
"@pnpm/hoist": "7.0.1",
|
|
29
|
+
"@pnpm/hooks.read-package-hook": "2.0.1",
|
|
30
|
+
"@pnpm/lifecycle": "14.0.1",
|
|
31
|
+
"@pnpm/link-bins": "8.0.1",
|
|
32
|
+
"@pnpm/lockfile-file": "6.0.1",
|
|
33
|
+
"@pnpm/lockfile-to-pnp": "2.0.1",
|
|
34
|
+
"@pnpm/lockfile-utils": "4.2.7",
|
|
35
|
+
"@pnpm/lockfile-walker": "6.0.1",
|
|
36
|
+
"@pnpm/manifest-utils": "4.1.0",
|
|
37
37
|
"@pnpm/matcher": "4.0.0",
|
|
38
|
-
"@pnpm/modules-cleaner": "13.0.
|
|
39
|
-
"@pnpm/modules-yaml": "11.0.
|
|
40
|
-
"@pnpm/normalize-registries": "4.0.
|
|
38
|
+
"@pnpm/modules-cleaner": "13.0.1",
|
|
39
|
+
"@pnpm/modules-yaml": "11.0.1",
|
|
40
|
+
"@pnpm/normalize-registries": "4.0.1",
|
|
41
41
|
"@pnpm/npm-package-arg": "^1.0.0",
|
|
42
|
-
"@pnpm/package-requester": "20.0.
|
|
42
|
+
"@pnpm/package-requester": "20.0.1",
|
|
43
43
|
"@pnpm/parse-wanted-dependency": "4.0.0",
|
|
44
|
-
"@pnpm/prune-lockfile": "4.0.
|
|
44
|
+
"@pnpm/prune-lockfile": "4.0.17",
|
|
45
45
|
"@pnpm/read-modules-dir": "5.0.0",
|
|
46
|
-
"@pnpm/read-package-json": "7.0.
|
|
47
|
-
"@pnpm/read-project-manifest": "4.0.
|
|
48
|
-
"@pnpm/remove-bins": "4.0.
|
|
49
|
-
"@pnpm/resolve-dependencies": "29.0.
|
|
50
|
-
"@pnpm/resolver-base": "9.1.
|
|
51
|
-
"@pnpm/store-controller-types": "14.1.
|
|
52
|
-
"@pnpm/symlink-dependency": "6.0.
|
|
53
|
-
"@pnpm/types": "8.
|
|
46
|
+
"@pnpm/read-package-json": "7.0.1",
|
|
47
|
+
"@pnpm/read-project-manifest": "4.0.1",
|
|
48
|
+
"@pnpm/remove-bins": "4.0.1",
|
|
49
|
+
"@pnpm/resolve-dependencies": "29.0.1",
|
|
50
|
+
"@pnpm/resolver-base": "9.1.3",
|
|
51
|
+
"@pnpm/store-controller-types": "14.1.4",
|
|
52
|
+
"@pnpm/symlink-dependency": "6.0.1",
|
|
53
|
+
"@pnpm/types": "8.8.0",
|
|
54
54
|
"@pnpm/which-version-is-pinned": "4.0.0",
|
|
55
55
|
"@zkochan/rimraf": "^2.1.2",
|
|
56
|
-
"dependency-path": "9.2.
|
|
56
|
+
"dependency-path": "9.2.7",
|
|
57
57
|
"is-inner-link": "^4.0.0",
|
|
58
58
|
"load-json-file": "^6.2.0",
|
|
59
59
|
"normalize-path": "^3.0.0",
|
|
@@ -67,17 +67,17 @@
|
|
|
67
67
|
"version-selector-type": "^3.0.0"
|
|
68
68
|
},
|
|
69
69
|
"devDependencies": {
|
|
70
|
-
"@pnpm/assert-project": "2.3.
|
|
71
|
-
"@pnpm/assert-store": "1.0.
|
|
72
|
-
"@pnpm/cafs": "5.0.
|
|
73
|
-
"@pnpm/client": "8.0.
|
|
74
|
-
"@pnpm/core": "7.0.
|
|
70
|
+
"@pnpm/assert-project": "2.3.13",
|
|
71
|
+
"@pnpm/assert-store": "1.0.50",
|
|
72
|
+
"@pnpm/cafs": "5.0.1",
|
|
73
|
+
"@pnpm/client": "8.0.1",
|
|
74
|
+
"@pnpm/core": "7.0.1",
|
|
75
75
|
"@pnpm/git-utils": "0.1.0",
|
|
76
|
-
"@pnpm/package-store": "15.0.
|
|
77
|
-
"@pnpm/prepare": "0.0.
|
|
76
|
+
"@pnpm/package-store": "15.0.1",
|
|
77
|
+
"@pnpm/prepare": "0.0.56",
|
|
78
78
|
"@pnpm/registry-mock": "3.1.0",
|
|
79
79
|
"@pnpm/store-path": "7.0.0",
|
|
80
|
-
"@pnpm/test-fixtures": "0.0.
|
|
80
|
+
"@pnpm/test-fixtures": "0.0.25",
|
|
81
81
|
"@types/fs-extra": "^9.0.13",
|
|
82
82
|
"@types/is-ci": "^3.0.0",
|
|
83
83
|
"@types/is-windows": "^1.0.0",
|