@pnpm/plugin-commands-installation 8.4.15 → 8.4.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/installDeps.js +2 -21
- package/lib/installDeps.js.map +1 -1
- package/package.json +8 -8
package/lib/installDeps.js
CHANGED
|
@@ -37,7 +37,6 @@ const core_1 = require("@pnpm/core");
|
|
|
37
37
|
const logger_1 = __importDefault(require("@pnpm/logger"));
|
|
38
38
|
const sort_packages_1 = require("@pnpm/sort-packages");
|
|
39
39
|
const is_subdir_1 = __importDefault(require("is-subdir"));
|
|
40
|
-
const isEmpty_1 = __importDefault(require("ramda/src/isEmpty"));
|
|
41
40
|
const getOptionsFromRootManifest_1 = __importDefault(require("./getOptionsFromRootManifest"));
|
|
42
41
|
const getPinnedVersion_1 = __importDefault(require("./getPinnedVersion"));
|
|
43
42
|
const getSaveType_1 = __importDefault(require("./getSaveType"));
|
|
@@ -50,7 +49,7 @@ const OVERWRITE_UPDATE_OPTIONS = {
|
|
|
50
49
|
update: false,
|
|
51
50
|
};
|
|
52
51
|
async function handler(opts, params) {
|
|
53
|
-
var _a, _b, _c, _d
|
|
52
|
+
var _a, _b, _c, _d;
|
|
54
53
|
if (opts.workspace) {
|
|
55
54
|
if (opts.latest) {
|
|
56
55
|
throw new error_1.default('BAD_OPTIONS', 'Cannot use --latest with --workspace simultaneously');
|
|
@@ -177,26 +176,8 @@ when running add/update with the --workspace option');
|
|
|
177
176
|
rootDir: opts.dir,
|
|
178
177
|
targetDependenciesField: (0, getSaveType_1.default)(opts),
|
|
179
178
|
};
|
|
180
|
-
|
|
179
|
+
const [updatedImporter] = await (0, core_1.mutateModules)([mutatedProject], installOpts);
|
|
181
180
|
if (opts.save !== false) {
|
|
182
|
-
if (opts.autoInstallPeers && !(0, isEmpty_1.default)((_f = (_e = updatedImporter.peerDependencyIssues) === null || _e === void 0 ? void 0 : _e.intersections) !== null && _f !== void 0 ? _f : {})) {
|
|
183
|
-
logger_1.default.info({
|
|
184
|
-
message: 'Installing missing peer dependencies',
|
|
185
|
-
prefix: opts.dir,
|
|
186
|
-
});
|
|
187
|
-
const dependencySelectors = Object.entries(updatedImporter.peerDependencyIssues.intersections)
|
|
188
|
-
.map(([name, version]) => `${name}@${version}`);
|
|
189
|
-
const result = await (0, core_1.mutateModules)([
|
|
190
|
-
{
|
|
191
|
-
...mutatedProject,
|
|
192
|
-
dependencySelectors,
|
|
193
|
-
manifest: updatedImporter.manifest,
|
|
194
|
-
peer: false,
|
|
195
|
-
targetDependenciesField: 'devDependencies',
|
|
196
|
-
},
|
|
197
|
-
], installOpts);
|
|
198
|
-
updatedImporter = result[0];
|
|
199
|
-
}
|
|
200
181
|
await writeProjectManifest(updatedImporter.manifest);
|
|
201
182
|
}
|
|
202
183
|
return;
|
package/lib/installDeps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDeps.js","sourceRoot":"","sources":["../src/installDeps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AACvB,+CAGwB;AAExB,wDAAmC;AACnC,+EAA6E;AAC7E,yFAAoG;AACpG,qFAA0E;AAC1E,6EAA6G;AAE7G,qCAMmB;AACnB,0DAAiC;AACjC,uDAAmD;AACnD,0DAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"installDeps.js","sourceRoot":"","sources":["../src/installDeps.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/plugin-commands-installation",
|
|
3
|
-
"version": "8.4.
|
|
3
|
+
"version": "8.4.16",
|
|
4
4
|
"description": "Commands for installation",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"@pnpm/lockfile-types": "3.2.0",
|
|
27
27
|
"@pnpm/logger": "^4.0.0",
|
|
28
28
|
"@pnpm/modules-yaml": "9.1.1",
|
|
29
|
-
"@pnpm/plugin-commands-installation": "8.4.
|
|
29
|
+
"@pnpm/plugin-commands-installation": "8.4.16",
|
|
30
30
|
"@pnpm/prepare": "0.0.37",
|
|
31
|
-
"@pnpm/registry-mock": "2.
|
|
31
|
+
"@pnpm/registry-mock": "2.17.0",
|
|
32
32
|
"@pnpm/test-fixtures": "0.0.6",
|
|
33
33
|
"@types/is-ci": "^3.0.0",
|
|
34
34
|
"@types/proxyquire": "^1.3.28",
|
|
@@ -47,24 +47,24 @@
|
|
|
47
47
|
"symlink-dir": "^5.0.0"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@pnpm/cli-utils": "0.6.
|
|
50
|
+
"@pnpm/cli-utils": "0.6.54",
|
|
51
51
|
"@pnpm/colorize-semver-diff": "^1.0.1",
|
|
52
52
|
"@pnpm/command": "2.0.0",
|
|
53
53
|
"@pnpm/common-cli-options-help": "0.8.0",
|
|
54
54
|
"@pnpm/config": "13.13.3",
|
|
55
55
|
"@pnpm/constants": "5.0.0",
|
|
56
|
-
"@pnpm/core": "2.
|
|
56
|
+
"@pnpm/core": "2.9.0",
|
|
57
57
|
"@pnpm/error": "2.1.0",
|
|
58
|
-
"@pnpm/filter-workspace-packages": "4.4.
|
|
58
|
+
"@pnpm/filter-workspace-packages": "4.4.27",
|
|
59
59
|
"@pnpm/find-workspace-dir": "3.0.2",
|
|
60
|
-
"@pnpm/find-workspace-packages": "3.1.
|
|
60
|
+
"@pnpm/find-workspace-packages": "3.1.46",
|
|
61
61
|
"@pnpm/graceful-fs": "1.0.0",
|
|
62
62
|
"@pnpm/manifest-utils": "2.1.10",
|
|
63
63
|
"@pnpm/matcher": "2.0.0",
|
|
64
64
|
"@pnpm/outdated": "9.0.34",
|
|
65
65
|
"@pnpm/package-store": "12.1.15",
|
|
66
66
|
"@pnpm/parse-wanted-dependency": "2.0.0",
|
|
67
|
-
"@pnpm/plugin-commands-rebuild": "5.4.
|
|
67
|
+
"@pnpm/plugin-commands-rebuild": "5.4.22",
|
|
68
68
|
"@pnpm/pnpmfile": "1.2.6",
|
|
69
69
|
"@pnpm/read-project-manifest": "2.0.13",
|
|
70
70
|
"@pnpm/resolver-base": "8.1.6",
|