@pnpm/plugin-commands-setup 1.1.1 → 1.1.5
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/setup.js +5 -4
- package/lib/setup.js.map +1 -1
- package/lib/setupOnWindows.d.ts +1 -0
- package/lib/setupOnWindows.js +76 -0
- package/lib/setupOnWindows.js.map +1 -0
- package/package.json +3 -2
package/lib/setup.js
CHANGED
|
@@ -10,6 +10,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
10
10
|
const cli_utils_1 = require("@pnpm/cli-utils");
|
|
11
11
|
const logger_1 = __importDefault(require("@pnpm/logger"));
|
|
12
12
|
const render_help_1 = __importDefault(require("render-help"));
|
|
13
|
+
const setupOnWindows_1 = require("./setupOnWindows");
|
|
13
14
|
const rcOptionsTypes = () => ({});
|
|
14
15
|
exports.rcOptionsTypes = rcOptionsTypes;
|
|
15
16
|
const cliOptionsTypes = () => ({});
|
|
@@ -46,15 +47,12 @@ function copyCli(currentLocation, targetDir) {
|
|
|
46
47
|
fs_1.default.copyFileSync(currentLocation, newExecPath);
|
|
47
48
|
}
|
|
48
49
|
async function handler(opts) {
|
|
49
|
-
const currentShell = process.env.SHELL ? path_1.default.basename(process.env.SHELL) : null;
|
|
50
|
+
const currentShell = typeof process.env.SHELL === 'string' ? path_1.default.basename(process.env.SHELL) : null;
|
|
50
51
|
const execPath = getExecPath();
|
|
51
52
|
if (execPath.match(/\.[cm]?js$/) == null) {
|
|
52
53
|
copyCli(execPath, opts.pnpmHomeDir);
|
|
53
54
|
}
|
|
54
55
|
const updateOutput = await updateShell(currentShell, opts.pnpmHomeDir);
|
|
55
|
-
if (updateOutput === false) {
|
|
56
|
-
return 'Could not infer shell type.';
|
|
57
|
-
}
|
|
58
56
|
return `${updateOutput}
|
|
59
57
|
|
|
60
58
|
Setup complete. Open a new terminal to start using pnpm.`;
|
|
@@ -74,6 +72,9 @@ async function updateShell(currentShell, pnpmHomeDir) {
|
|
|
74
72
|
return setupFishShell(pnpmHomeDir);
|
|
75
73
|
}
|
|
76
74
|
}
|
|
75
|
+
if (process.platform === 'win32') {
|
|
76
|
+
return setupOnWindows_1.setupWindowsEnvironmentPath(pnpmHomeDir);
|
|
77
|
+
}
|
|
77
78
|
return 'Could not infer shell type.';
|
|
78
79
|
}
|
|
79
80
|
async function setupShell(configFile, pnpmHomeDir) {
|
package/lib/setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,4CAAmB;AACnB,gDAAuB;AACvB,+CAAyC;AACzC,0DAAiC;AACjC,8DAAoC;
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,4CAAmB;AACnB,gDAAuB;AACvB,+CAAyC;AACzC,0DAAiC;AACjC,8DAAoC;AACpC,qDAA8D;AAEvD,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;AAA3B,QAAA,cAAc,kBAAa;AAEjC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;AAA5B,QAAA,eAAe,mBAAa;AAE5B,QAAA,UAAU,GAAG,EAAE,CAAA;AAEf,QAAA,YAAY,GAAG,CAAC,OAAO,CAAC,CAAA;AAErC,SAAgB,IAAI;IAClB,OAAO,qBAAU,CAAC;QAChB,WAAW,EAAE,cAAc;QAC3B,gBAAgB,EAAE,EACjB;QACD,GAAG,EAAE,mBAAO,CAAC,OAAO,CAAC;QACrB,MAAM,EAAE,CAAC,YAAY,CAAC;KACvB,CAAC,CAAA;AACJ,CAAC;AARD,oBAQC;AAED,SAAS,WAAW;IAClB,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE;QAC1B,4FAA4F;QAC5F,8EAA8E;QAC9E,4CAA4C;QAC5C,OAAO,OAAO,CAAC,QAAQ,CAAA;KACxB;IACD,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAA;AACvE,CAAC;AAED,SAAS,OAAO,CAAE,eAAuB,EAAE,SAAiB;IAC1D,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAA;IACxE,IAAI,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,KAAK,EAAE;QAAE,OAAM;IAC9D,gBAAM,CAAC,IAAI,CAAC;QACV,OAAO,EAAE,yBAAyB,eAAe,OAAO,WAAW,EAAE;QACrE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE;KACtB,CAAC,CAAA;IACF,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5C,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;AAC/C,CAAC;AAEM,KAAK,UAAU,OAAO,CAC3B,IAEC;IAED,MAAM,YAAY,GAAG,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACpG,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,IAAI,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;QACxC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;KACpC;IACD,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;IACtE,OAAO,GAAG,YAAY;;yDAEiC,CAAA;AACzD,CAAC;AAdD,0BAcC;AAED,KAAK,UAAU,WAAW,CAAE,YAA2B,EAAE,WAAmB;IAC1E,QAAQ,YAAY,EAAE;QACtB,KAAK,MAAM,CAAC,CAAC;YACX,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAA;YACrD,OAAO,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;SAC3C;QACD,KAAK,KAAK,CAAC,CAAC;YACV,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAA;YACpD,OAAO,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;SAC3C;QACD,KAAK,MAAM,CAAC,CAAC;YACX,OAAO,cAAc,CAAC,WAAW,CAAC,CAAA;SACnC;KACA;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,OAAO,4CAA2B,CAAC,WAAW,CAAC,CAAA;KAChD;IAED,OAAO,6BAA6B,CAAA;AACtC,CAAC;AAED,KAAK,UAAU,UAAU,CAAE,UAAkB,EAAE,WAAmB;IAChE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,4BAA4B,UAAU,QAAQ,CAAA;IACrF,MAAM,aAAa,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IACpE,IAAI,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACvC,OAAO,2BAA2B,UAAU,EAAE,CAAA;KAC/C;IACD,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,aAAa;oBACtC,WAAW;;CAE9B,EAAE,MAAM,CAAC,CAAA;IACR,OAAO,WAAW,UAAU,EAAE,CAAA;AAChC,CAAC;AAED,KAAK,UAAU,cAAc,CAAE,WAAmB;IAChD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAA;IACtE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,4BAA4B,UAAU,QAAQ,CAAA;IACrF,MAAM,aAAa,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IACpE,IAAI,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACvC,OAAO,2BAA2B,UAAU,EAAE,CAAA;KAC/C;IACD,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,aAAa;qBACrC,WAAW;;CAE/B,EAAE,MAAM,CAAC,CAAA;IACR,OAAO,WAAW,UAAU,EAAE,CAAA;AAChC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function setupWindowsEnvironmentPath(pnpmHomeDir: string): Promise<string>;
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.setupWindowsEnvironmentPath = void 0;
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
const execa_1 = __importDefault(require("execa"));
|
|
9
|
+
async function setupWindowsEnvironmentPath(pnpmHomeDir) {
|
|
10
|
+
const pathRegex = /^ {4}(?<name>PATH) {4}(?<type>\w+) {4}(?<data>.*)$/gim;
|
|
11
|
+
const pnpmHomeRegex = /^ {4}(?<name>PNPM_HOME) {4}(?<type>\w+) {4}(?<data>.*)$/gim;
|
|
12
|
+
const regKey = 'HKEY_CURRENT_USER\\Environment';
|
|
13
|
+
const queryResult = await execa_1.default('reg', ['query', regKey]);
|
|
14
|
+
if (queryResult.failed) {
|
|
15
|
+
return 'Win32 registry environment values could not be retrieved';
|
|
16
|
+
}
|
|
17
|
+
const queryOutput = queryResult.stdout;
|
|
18
|
+
const pathValueMatch = [...queryOutput.matchAll(pathRegex)];
|
|
19
|
+
const homeValueMatch = [...queryOutput.matchAll(pnpmHomeRegex)];
|
|
20
|
+
let commitNeeded = false;
|
|
21
|
+
let homeDir = pnpmHomeDir;
|
|
22
|
+
const logger = [];
|
|
23
|
+
if (homeValueMatch.length === 1) {
|
|
24
|
+
homeDir = homeValueMatch[0].groups.data;
|
|
25
|
+
logger.push(`Currently 'PNPM_HOME' is set to '${homeDir}'`);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
logger.push(`Setting 'PNPM_HOME' to value '${homeDir}'`);
|
|
29
|
+
const addResult = await execa_1.default('reg', ['add', regKey, '/v', 'PNPM_HOME', '/t', 'REG_EXPAND_SZ', '/d', homeDir, '/f']);
|
|
30
|
+
if (addResult.failed) {
|
|
31
|
+
logger.push(`\t${addResult.stderr}`);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
commitNeeded = true;
|
|
35
|
+
logger.push(`\t${addResult.stdout}`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (pathValueMatch.length === 1) {
|
|
39
|
+
const pathData = pathValueMatch[0].groups.data;
|
|
40
|
+
if (pathData == null || pathData.trim() === '') {
|
|
41
|
+
logger.push('Current PATH is empty. No changes to this environment variable are applied');
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
const homeDirPath = path_1.win32.parse(path_1.win32.normalize(homeDir));
|
|
45
|
+
if (pathData
|
|
46
|
+
.split(path_1.win32.delimiter)
|
|
47
|
+
.map(p => path_1.win32.normalize(p))
|
|
48
|
+
.map(p => path_1.win32.parse(p))
|
|
49
|
+
.map(p => `${p.dir}${path_1.win32.sep}${p.base}`.toUpperCase())
|
|
50
|
+
.filter(p => p !== '')
|
|
51
|
+
.includes(`${homeDirPath.dir}${path_1.win32.sep}${homeDirPath.base}`.toUpperCase())) {
|
|
52
|
+
logger.push('PATH already contains PNPM_HOME');
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
logger.push('Updating PATH');
|
|
56
|
+
const addResult = await execa_1.default('reg', ['add', regKey, '/v', pathValueMatch[0].groups.name, '/t', 'REG_EXPAND_SZ', '/d', `${homeDir}${path_1.win32.delimiter}${pathData}`, '/f']);
|
|
57
|
+
if (addResult.failed) {
|
|
58
|
+
logger.push(`\t${addResult.stderr}`);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
commitNeeded = true;
|
|
62
|
+
logger.push(`\t${addResult.stdout}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
logger.push('Current PATH is not set. No changes to this environment variable are applied');
|
|
69
|
+
}
|
|
70
|
+
if (commitNeeded) {
|
|
71
|
+
await execa_1.default('setx', ['PNPM_HOME', homeDir]);
|
|
72
|
+
}
|
|
73
|
+
return logger.join('\n');
|
|
74
|
+
}
|
|
75
|
+
exports.setupWindowsEnvironmentPath = setupWindowsEnvironmentPath;
|
|
76
|
+
//# sourceMappingURL=setupOnWindows.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupOnWindows.js","sourceRoot":"","sources":["../src/setupOnWindows.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/plugin-commands-setup",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.5",
|
|
4
4
|
"description": "pnpm commands for setting up pnpm",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -22,7 +22,8 @@
|
|
|
22
22
|
},
|
|
23
23
|
"homepage": "https://github.com/pnpm/pnpm/blob/master/packages/plugin-commands-setup#readme",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@pnpm/cli-utils": "0.6.
|
|
25
|
+
"@pnpm/cli-utils": "0.6.21",
|
|
26
|
+
"execa": "npm:safe-execa@^0.1.1",
|
|
26
27
|
"render-help": "^1.0.1"
|
|
27
28
|
},
|
|
28
29
|
"funding": "https://opencollective.com/pnpm",
|