@pnpm/plugin-commands-installation 7.0.3 → 7.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/install.d.ts +1 -1
- package/lib/installDeps.d.ts +1 -1
- package/lib/installDeps.js +6 -2
- package/lib/installDeps.js.map +1 -1
- package/package.json +10 -10
package/lib/install.d.ts
CHANGED
|
@@ -19,5 +19,5 @@ export declare type InstallCommandOptions = Pick<Config, 'allProjects' | 'bail'
|
|
|
19
19
|
useBetaCli?: boolean;
|
|
20
20
|
recursive?: boolean;
|
|
21
21
|
workspace?: boolean;
|
|
22
|
-
} & Partial<Pick<Config, 'preferWorkspacePackages'>>;
|
|
22
|
+
} & Partial<Pick<Config, 'pnpmHomeDir' | 'preferWorkspacePackages'>>;
|
|
23
23
|
export declare function handler(opts: InstallCommandOptions): Promise<void>;
|
package/lib/installDeps.d.ts
CHANGED
|
@@ -16,5 +16,5 @@ export declare type InstallDepsOptions = Pick<Config, 'allProjects' | 'bail' | '
|
|
|
16
16
|
useBetaCli?: boolean;
|
|
17
17
|
recursive?: boolean;
|
|
18
18
|
workspace?: boolean;
|
|
19
|
-
}
|
|
19
|
+
} & Partial<Pick<Config, 'pnpmHomeDir'>>;
|
|
20
20
|
export default function handler(opts: InstallDepsOptions, params: string[]): Promise<void>;
|
package/lib/installDeps.js
CHANGED
|
@@ -32,6 +32,7 @@ const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
|
32
32
|
const core_1 = require("@pnpm/core");
|
|
33
33
|
const logger_1 = __importDefault(require("@pnpm/logger"));
|
|
34
34
|
const sort_packages_1 = require("@pnpm/sort-packages");
|
|
35
|
+
const is_subdir_1 = __importDefault(require("is-subdir"));
|
|
35
36
|
const getPinnedVersion_1 = __importDefault(require("./getPinnedVersion"));
|
|
36
37
|
const getSaveType_1 = __importDefault(require("./getSaveType"));
|
|
37
38
|
const nodeExecPath_1 = __importDefault(require("./nodeExecPath"));
|
|
@@ -121,8 +122,11 @@ when running add/update with the --workspace option');
|
|
|
121
122
|
storeDir: store.dir,
|
|
122
123
|
workspacePackages,
|
|
123
124
|
};
|
|
124
|
-
if (opts.global) {
|
|
125
|
-
|
|
125
|
+
if (opts.global && opts.pnpmHomeDir != null) {
|
|
126
|
+
const nodeExecPath = await (0, nodeExecPath_1.default)();
|
|
127
|
+
if ((0, is_subdir_1.default)(opts.pnpmHomeDir, nodeExecPath)) {
|
|
128
|
+
installOpts['nodeExecPath'] = nodeExecPath;
|
|
129
|
+
}
|
|
126
130
|
}
|
|
127
131
|
let { manifest, writeProjectManifest } = await (0, cli_utils_1.tryReadProjectManifest)(opts.dir, opts);
|
|
128
132
|
if (manifest === null) {
|
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,qCAImB;AACnB,0DAAiC;AACjC,uDAAmD;AACnD,0EAAiD;AACjD,gEAAuC;AACvC,
|
|
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": "7.0.
|
|
3
|
+
"version": "7.0.4",
|
|
4
4
|
"description": "Commands for installation",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -45,26 +45,26 @@
|
|
|
45
45
|
"write-yaml-file": "^4.2.0"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@pnpm/cli-utils": "0.6.
|
|
48
|
+
"@pnpm/cli-utils": "0.6.28",
|
|
49
49
|
"@pnpm/colorize-semver-diff": "^1.0.1",
|
|
50
50
|
"@pnpm/command": "2.0.0",
|
|
51
51
|
"@pnpm/common-cli-options-help": "0.7.1",
|
|
52
|
-
"@pnpm/config": "13.
|
|
52
|
+
"@pnpm/config": "13.4.0",
|
|
53
53
|
"@pnpm/constants": "5.0.0",
|
|
54
54
|
"@pnpm/error": "2.0.0",
|
|
55
|
-
"@pnpm/filter-workspace-packages": "4.
|
|
55
|
+
"@pnpm/filter-workspace-packages": "4.4.0",
|
|
56
56
|
"@pnpm/find-workspace-dir": "3.0.1",
|
|
57
|
-
"@pnpm/find-workspace-packages": "3.1.
|
|
57
|
+
"@pnpm/find-workspace-packages": "3.1.20",
|
|
58
58
|
"@pnpm/manifest-utils": "2.1.0",
|
|
59
|
-
"@pnpm/outdated": "9.0.
|
|
59
|
+
"@pnpm/outdated": "9.0.10",
|
|
60
60
|
"@pnpm/package-store": "12.0.15",
|
|
61
61
|
"@pnpm/parse-wanted-dependency": "2.0.0",
|
|
62
|
-
"@pnpm/plugin-commands-rebuild": "5.1.
|
|
62
|
+
"@pnpm/plugin-commands-rebuild": "5.1.4",
|
|
63
63
|
"@pnpm/pnpmfile": "1.1.0",
|
|
64
64
|
"@pnpm/resolver-base": "8.0.4",
|
|
65
65
|
"@pnpm/semver-diff": "^1.0.2",
|
|
66
66
|
"@pnpm/sort-packages": "2.1.1",
|
|
67
|
-
"@pnpm/store-connection-manager": "3.1.
|
|
67
|
+
"@pnpm/store-connection-manager": "3.1.1",
|
|
68
68
|
"@pnpm/types": "7.4.0",
|
|
69
69
|
"@zkochan/table": "^1.0.0",
|
|
70
70
|
"@zkochan/which": "^2.0.3",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"ramda": "^0.27.1",
|
|
82
82
|
"read-ini-file": "^3.1.0",
|
|
83
83
|
"render-help": "^1.0.1",
|
|
84
|
-
"@pnpm/core": "1.0.
|
|
84
|
+
"@pnpm/core": "1.0.1",
|
|
85
85
|
"version-selector-type": "^3.0.0"
|
|
86
86
|
},
|
|
87
87
|
"peerDependencies": {
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
},
|
|
90
90
|
"funding": "https://opencollective.com/pnpm",
|
|
91
91
|
"scripts": {
|
|
92
|
-
"lint": "eslint
|
|
92
|
+
"lint": "eslint src/**/*.ts test/**/*.ts",
|
|
93
93
|
"registry-mock": "registry-mock",
|
|
94
94
|
"test:jest": "jest",
|
|
95
95
|
"test:e2e": "registry-mock prepare && run-p -r registry-mock test:jest",
|