@pnpm/plugin-commands-env 4.0.30 → 4.1.0

package/lib/downloadNodeVersion.d.ts

@@ -0,0 +1,12 @@
+import { type NvmNodeCommandOptions } from './node';
+export declare function getNodeVersion(opts: NvmNodeCommandOptions, envSpecifier: string): Promise<{
+    nodeVersion: string | null;
+    nodeMirrorBaseUrl: string;
+    releaseChannel: string;
+    versionSpecifier: string;
+}>;
+export declare function downloadNodeVersion(opts: NvmNodeCommandOptions, envSpecifier: string): Promise<{
+    nodeVersion: string;
+    nodeDir: string;
+    nodeMirrorBaseUrl: string;
+} | null>;

package/lib/downloadNodeVersion.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadNodeVersion = exports.getNodeVersion = void 0;
+const node_resolver_1 = require("@pnpm/node.resolver");
+const getNodeMirror_1 = require("./getNodeMirror");
+const node_1 = require("./node");
+const parseEnvSpecifier_1 = require("./parseEnvSpecifier");
+const fetch_1 = require("@pnpm/fetch");
+const logger_1 = require("@pnpm/logger");
+async function getNodeVersion(opts, envSpecifier) {
+    const fetch = (0, fetch_1.createFetchFromRegistry)(opts);
+    const { releaseChannel, versionSpecifier } = (0, parseEnvSpecifier_1.parseEnvSpecifier)(envSpecifier);
+    const nodeMirrorBaseUrl = (0, getNodeMirror_1.getNodeMirror)(opts.rawConfig, releaseChannel);
+    const nodeVersion = await (0, node_resolver_1.resolveNodeVersion)(fetch, versionSpecifier, nodeMirrorBaseUrl);
+    return { nodeVersion, nodeMirrorBaseUrl, releaseChannel, versionSpecifier };
+}
+exports.getNodeVersion = getNodeVersion;
+async function downloadNodeVersion(opts, envSpecifier) {
+    const fetch = (0, fetch_1.createFetchFromRegistry)(opts);
+    const { nodeVersion, nodeMirrorBaseUrl } = await getNodeVersion(opts, envSpecifier);
+    if (!nodeVersion) {
+        return null;
+    }
+    const nodeDir = await (0, node_1.getNodeDir)(fetch, {
+        ...opts,
+        useNodeVersion: nodeVersion,
+        nodeMirrorBaseUrl,
+    });
+    (0, logger_1.globalInfo)(`Node.js ${nodeVersion} was installed
+  ${nodeDir}`);
+    return { nodeVersion, nodeDir, nodeMirrorBaseUrl };
+}
+exports.downloadNodeVersion = downloadNodeVersion;
+//# sourceMappingURL=downloadNodeVersion.js.map

package/lib/downloadNodeVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"downloadNodeVersion.js","sourceRoot":"","sources":["../src/downloadNodeVersion.ts"],"names":[],"mappings":";;;AAAA,uDAAwD;AACxD,mDAA+C;AAC/C,iCAA+D;AAC/D,2DAAuD;AACvD,uCAAqD;AACrD,yCAAyC;AAElC,KAAK,UAAU,cAAc,CAAE,IAA2B,EAAE,YAAoB;IACrF,MAAM,KAAK,GAAG,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,IAAA,qCAAiB,EAAC,YAAY,CAAC,CAAA;IAC5E,MAAM,iBAAiB,GAAG,IAAA,6BAAa,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;IACvE,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAkB,EAAC,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAA;IACxF,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAA;AAC7E,CAAC;AAND,wCAMC;AAEM,KAAK,UAAU,mBAAmB,CAAE,IAA2B,EAAE,YAAoB;IAC1F,MAAM,KAAK,GAAG,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;IACnF,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,IAAI,CAAA;KACZ;IACD,MAAM,OAAO,GAAG,MAAM,IAAA,iBAAU,EAAC,KAAK,EAAE;QACtC,GAAG,IAAI;QACP,cAAc,EAAE,WAAW;QAC3B,iBAAiB;KAClB,CAAC,CAAA;IACF,IAAA,mBAAU,EAAC,WAAW,WAAqB;IACzC,OAAO,EAAE,CAAC,CAAA;IACZ,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAA;AACpD,CAAC;AAdD,kDAcC"}

package/lib/env.d.ts

@@ -6,4 +6,6 @@ export declare function cliOptionsTypes(): {
 };
 export declare const commandNames: string[];
 export declare function help(): string;
-export declare function handler(opts: NvmNodeCommandOptions, params: string[]): Promise<string>;
+export declare function handler(opts: NvmNodeCommandOptions, params: string[]): Promise<string | {
+    exitCode: number;
+}>;

package/lib/env.js

@@ -10,6 +10,7 @@ const render_help_1 = __importDefault(require("render-help"));
 const envRemove_1 = require("./envRemove");
 const envUse_1 = require("./envUse");
 const envList_1 = require("./envList");
+const envAdd_1 = require("./envAdd");
 function rcOptionsTypes() {
     return {};
 }
@@ -30,11 +31,15 @@ function help() {
                 title: 'Commands',
                 list: [
                     {
-                        description: 'Installs the specified version of Node.js. The npm CLI bundled with the given Node.js version gets installed as well.',
+                        description: 'Installs the specified version of Node.js. The npm CLI bundled with the given Node.js version gets installed as well. This sets this version of Node.js as the current version.',
                         name: 'use',
                     },
                     {
-                        description: 'Removes the specified version of Node.js.',
+                        description: 'Installs the specified version(s) of Node.js without activating them as the current version.',
+                        name: 'add',
+                    },
+                    {
+                        description: 'Removes the specified version(s) of Node.js.',
                         name: 'remove',
                         shortAlias: 'rm',
                     },
@@ -62,17 +67,18 @@ function help() {
         ],
         url: (0, cli_utils_1.docsUrl)('env'),
         usages: [
-            'pnpm env [command] [options] <version>',
+            'pnpm env [command] [options] <version> [<additional-versions>...]',
             'pnpm env use --global 16',
             'pnpm env use --global lts',
             'pnpm env use --global argon',
             'pnpm env use --global latest',
             'pnpm env use --global rc/16',
-            'pnpm env remove --global 16',
-            'pnpm env remove --global lts',
+            'pnpm env add --global 16',
+            'pnpm env add --global 18 19 20.6.0',
+            'pnpm env remove --global 16 lts',
             'pnpm env remove --global argon',
             'pnpm env remove --global latest',
-            'pnpm env remove --global rc/16',
+            'pnpm env remove --global rc/16 16 20.6.0',
             'pnpm env list',
             'pnpm env list --remote',
             'pnpm env list --remote 16',
@@ -96,6 +102,9 @@ async function handler(opts, params) {
         });
     }
     switch (params[0]) {
+        case 'add': {
+            return (0, envAdd_1.envAdd)(opts, params.slice(1));
+        }
         case 'use': {
             return (0, envUse_1.envUse)(opts, params.slice(1));
         }

package/lib/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AACzC,uCAAuC;AACvC,8DAAoC;AACpC,2CAAuC;AACvC,qCAAiC;AAEjC,uCAAmC;AACnC,qCAAiC;AAEjC,SAAgB,cAAc;IAC5B,OAAO,EAAE,CAAA;AACX,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe;IAC7B,OAAO;QACL,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,OAAO;KAChB,CAAA;AACH,CAAC;AALD,0CAKC;AAEY,QAAA,YAAY,GAAG,CAAC,KAAK,CAAC,CAAA;AAEnC,SAAgB,IAAI;IAClB,OAAO,IAAA,qBAAU,EAAC;QAChB,WAAW,EAAE,0BAA0B;QACvC,gBAAgB,EAAE;YAChB;gBACE,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE;oBACJ;wBACE,WAAW,EAAE,iLAAiL;wBAC9L,IAAI,EAAE,KAAK;qBACZ;oBACD;wBACE,WAAW,EAAE,8FAA8F;wBAC3G,IAAI,EAAE,KAAK;qBACZ;oBACD;wBACE,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE,IAAI;qBACjB;oBACD;wBACE,WAAW,EAAE,qDAAqD;wBAClE,IAAI,EAAE,MAAM;wBACZ,UAAU,EAAE,IAAI;qBACjB;iBACF;aACF;YACD;gBACE,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE;oBACJ;wBACE,WAAW,EAAE,mCAAmC;wBAChD,IAAI,EAAE,UAAU;wBAChB,UAAU,EAAE,IAAI;qBACjB;oBACD;wBACE,WAAW,EAAE,qCAAqC;wBAClD,IAAI,EAAE,UAAU;qBACjB;iBACF;aACF;SACF;QACD,GAAG,EAAE,IAAA,mBAAO,EAAC,KAAK,CAAC;QACnB,MAAM,EAAE;YACN,mEAAmE;YACnE,0BAA0B;YAC1B,2BAA2B;YAC3B,6BAA6B;YAC7B,8BAA8B;YAC9B,6BAA6B;YAC7B,0BAA0B;YAC1B,oCAAoC;YACpC,iCAAiC;YACjC,gCAAgC;YAChC,iCAAiC;YACjC,0CAA0C;YAC1C,eAAe;YACf,wBAAwB;YACxB,2BAA2B;YAC3B,4BAA4B;YAC5B,8BAA8B;YAC9B,+BAA+B;YAC/B,8BAA8B;SAC/B;KACF,CAAC,CAAA;AACJ,CAAC;AAjED,oBAiEC;AAEM,KAAK,UAAU,OAAO,CAAE,IAA2B,EAAE,MAAgB;IAC1E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,MAAM,IAAI,iBAAS,CAAC,mBAAmB,EAAE,+BAA+B,EAAE;YACxE,IAAI,EAAE,IAAI,EAAE;SACb,CAAC,CAAA;KACH;IACD,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;QAC5B,MAAM,IAAI,iBAAS,CAAC,oBAAoB,EAAE,kGAAkG,EAAE;YAC5I,IAAI,EAAE,2OAA2O;SAClP,CAAC,CAAA;KACH;IACD,QAAQ,MAAM,CAAC,CAAC,CAAC,EAAE;QACnB,KAAK,KAAK,CAAC,CAAC;YACV,OAAO,IAAA,eAAM,EAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;SACrC;QACD,KAAK,KAAK,CAAC,CAAC;YACV,OAAO,IAAA,eAAM,EAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;SACrC;QACD,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI,CAAC;QACV,KAAK,WAAW,CAAC;QACjB,KAAK,IAAI,CAAC,CAAC;YACT,OAAO,IAAA,qBAAS,EAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;SACxC;QACD,KAAK,MAAM,CAAC;QACZ,KAAK,IAAI,CAAC,CAAC;YACT,OAAO,IAAA,iBAAO,EAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;SACtC;QACD,OAAO,CAAC,CAAC;YACP,MAAM,IAAI,iBAAS,CAAC,wBAAwB,EAAE,8BAA8B,CAAC,CAAA;SAC9E;KACA;AACH,CAAC;AAhCD,0BAgCC"}

package/lib/envAdd.d.ts

@@ -0,0 +1,2 @@
+import { type NvmNodeCommandOptions } from './node';
+export declare function envAdd(opts: NvmNodeCommandOptions, params: string[]): Promise<string>;

package/lib/envAdd.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.envAdd = void 0;
+/* eslint-disable no-await-in-loop */
+const error_1 = require("@pnpm/error");
+const downloadNodeVersion_1 = require("./downloadNodeVersion");
+async function envAdd(opts, params) {
+    if (!opts.global) {
+        throw new error_1.PnpmError('NOT_IMPLEMENTED_YET', '"pnpm env use <version>" can only be used with the "--global" option currently');
+    }
+    const failed = [];
+    for (const envSpecifier of params) {
+        const result = await (0, downloadNodeVersion_1.downloadNodeVersion)(opts, envSpecifier);
+        if (!result) {
+            failed.push(envSpecifier);
+        }
+    }
+    if (failed.length > 0) {
+        throw new error_1.PnpmError('COULD_NOT_RESOLVE_NODEJS', `Couldn't find Node.js version matching ${failed.join(', ')}`);
+    }
+    return 'All specified Node.js versions were installed';
+}
+exports.envAdd = envAdd;
+//# sourceMappingURL=envAdd.js.map

package/lib/envAdd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"envAdd.js","sourceRoot":"","sources":["../src/envAdd.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,uCAAuC;AAEvC,+DAA2D;AAEpD,KAAK,UAAU,MAAM,CAAE,IAA2B,EAAE,MAAgB;IACzE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,iBAAS,CAAC,qBAAqB,EAAE,gFAAgF,CAAC,CAAA;KAC7H;IACD,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE;QACjC,MAAM,MAAM,GAAG,MAAM,IAAA,yCAAmB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QAC5D,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAC1B;KACF;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,iBAAS,CAAC,0BAA0B,EAAE,0CAA0C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KAC/G;IACD,OAAO,+CAA+C,CAAA;AACxD,CAAC;AAfD,wBAeC"}

package/lib/envRemove.d.ts

@@ -1,2 +1,4 @@
 import { type NvmNodeCommandOptions } from './node';
-export declare function envRemove(opts: NvmNodeCommandOptions, params: string[]): Promise<string>;
+export declare function envRemove(opts: NvmNodeCommandOptions, params: string[]): Promise<{
+    exitCode: number;
+}>;

package/lib/envRemove.js

@@ -4,33 +4,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.envRemove = void 0;
+/* eslint-disable no-await-in-loop */
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const error_1 = require("@pnpm/error");
-const fetch_1 = require("@pnpm/fetch");
 const logger_1 = require("@pnpm/logger");
-const node_resolver_1 = require("@pnpm/node.resolver");
 const remove_bins_1 = require("@pnpm/remove-bins");
 const rimraf_1 = __importDefault(require("@zkochan/rimraf"));
-const parseEnvSpecifier_1 = require("./parseEnvSpecifier");
 const utils_1 = require("./utils");
-const getNodeMirror_1 = require("./getNodeMirror");
 const node_1 = require("./node");
+const downloadNodeVersion_1 = require("./downloadNodeVersion");
 async function envRemove(opts, params) {
     if (!opts.global) {
         throw new error_1.PnpmError('NOT_IMPLEMENTED_YET', '"pnpm env use <version>" can only be used with the "--global" option currently');
     }
-    const fetch = (0, fetch_1.createFetchFromRegistry)(opts);
-    const { releaseChannel, versionSpecifier } = (0, parseEnvSpecifier_1.parseEnvSpecifier)(params[0]);
-    const nodeMirrorBaseUrl = (0, getNodeMirror_1.getNodeMirror)(opts.rawConfig, releaseChannel);
-    const nodeVersion = await (0, node_resolver_1.resolveNodeVersion)(fetch, versionSpecifier, nodeMirrorBaseUrl);
+    let failed = false;
+    for (const version of params) {
+        const err = await removeNodeVersion(opts, version);
+        if (err) {
+            logger_1.logger.error(err);
+            failed = true;
+        }
+    }
+    return { exitCode: failed ? 1 : 0 };
+}
+exports.envRemove = envRemove;
+async function removeNodeVersion(opts, version) {
+    const { nodeVersion } = await (0, downloadNodeVersion_1.getNodeVersion)(opts, version);
     const nodeDir = (0, node_1.getNodeVersionsBaseDir)(opts.pnpmHomeDir);
     if (!nodeVersion) {
-        throw new error_1.PnpmError('COULD_NOT_RESOLVE_NODEJS', `Couldn't find Node.js version matching ${params[0]}`);
+        return new error_1.PnpmError('COULD_NOT_RESOLVE_NODEJS', `Couldn't find Node.js version matching ${version}`);
     }
     const versionDir = path_1.default.resolve(nodeDir, nodeVersion);
     if (!(0, fs_1.existsSync)(versionDir)) {
-        throw new error_1.PnpmError('ENV_NO_NODE_DIRECTORY', `Couldn't find Node.js directory in ${versionDir}`);
+        return new error_1.PnpmError('ENV_NO_NODE_DIRECTORY', `Couldn't find Node.js directory in ${versionDir}`);
     }
     const { nodePath, nodeLink } = await (0, utils_1.getNodeExecPathAndTargetDir)(opts.pnpmHomeDir);
     if (nodeLink?.includes(versionDir)) {
@@ -46,12 +53,12 @@ async function envRemove(opts, params) {
         }
         catch (err) { // eslint-disable-line
             if (err.code !== 'ENOENT')
-                throw err;
+                return err;
         }
     }
     await (0, rimraf_1.default)(versionDir);
-    return `Node.js ${nodeVersion} is removed
-${versionDir}`;
+    (0, logger_1.globalInfo)(`Node.js ${nodeVersion} was removed
+${versionDir}`);
+    return undefined;
 }
-exports.envRemove = envRemove;
 //# sourceMappingURL=envRemove.js.map

package/lib/envRemove.js.map

@@ -1 +1 @@
-{"version":3,"file":"envRemove.js","sourceRoot":"","sources":["../src/envRemove.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA+B;AAC/B,gDAAuB;AACvB,uCAAuC;AACvC,uCAAqD;AACrD,yCAAyC;AACzC,uDAAwD;AACxD,mDAA6C;AAC7C,6DAAoC;AACpC,2DAAuD;AACvD,mCAAqD;AACrD,mDAA+C;AAC/C,iCAA2E;AAEpE,KAAK,UAAU,SAAS,CAAE,IAA2B,EAAE,MAAgB;IAC5E,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,iBAAS,CAAC,qBAAqB,EAAE,gFAAgF,CAAC,CAAA;KAC7H;IAED,MAAM,KAAK,GAAG,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,IAAA,qCAAiB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IACzE,MAAM,iBAAiB,GAAG,IAAA,6BAAa,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;IACvE,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAkB,EAAC,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAA;IACxF,MAAM,OAAO,GAAG,IAAA,6BAAsB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,iBAAS,CAAC,0BAA0B,EAAE,0CAA0C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;KACvG;IAED,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IAErD,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;QAC3B,MAAM,IAAI,iBAAS,CAAC,uBAAuB,EAAE,sCAAsC,UAAU,EAAE,CAAC,CAAA;KACjG;IAED,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,mCAA2B,EAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAElF,IAAI,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE;QAClC,IAAA,mBAAU,EAAC,mBAAmB,WAAqB,gDAAgD,CAAC,CAAA;QAEpG,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QACrD,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAErD,IAAI;YACF,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAA,uBAAS,EAAC,QAAQ,CAAC;gBACnB,IAAA,uBAAS,EAAC,OAAO,CAAC;gBAClB,IAAA,uBAAS,EAAC,OAAO,CAAC;aACnB,CAAC,CAAA;SACH;QAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;YACzC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,GAAG,CAAA;SACrC;KACF;IAED,MAAM,IAAA,gBAAM,EAAC,UAAU,CAAC,CAAA;IAExB,OAAO,WAAW,WAAqB;EACvC,UAAU,EAAE,CAAA;AACd,CAAC;AA5CD,8BA4CC"}
+{"version":3,"file":"envRemove.js","sourceRoot":"","sources":["../src/envRemove.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAqC;AACrC,2BAA+B;AAC/B,gDAAuB;AACvB,uCAAuC;AACvC,yCAAiD;AACjD,mDAA6C;AAC7C,6DAAoC;AACpC,mCAAqD;AACrD,iCAA2E;AAC3E,+DAAsD;AAE/C,KAAK,UAAU,SAAS,CAAE,IAA2B,EAAE,MAAgB;IAC5E,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,iBAAS,CAAC,qBAAqB,EAAE,gFAAgF,CAAC,CAAA;KAC7H;IAED,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAClD,IAAI,GAAG,EAAE;YACP,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACjB,MAAM,GAAG,IAAI,CAAA;SACd;KACF;IACD,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACrC,CAAC;AAdD,8BAcC;AAED,KAAK,UAAU,iBAAiB,CAAE,IAA2B,EAAE,OAAe;IAC5E,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,oCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAC3D,MAAM,OAAO,GAAG,IAAA,6BAAsB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,IAAI,iBAAS,CAAC,0BAA0B,EAAE,0CAA0C,OAAO,EAAE,CAAC,CAAA;KACtG;IAED,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IAErD,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;QAC3B,OAAO,IAAI,iBAAS,CAAC,uBAAuB,EAAE,sCAAsC,UAAU,EAAE,CAAC,CAAA;KAClG;IAED,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,mCAA2B,EAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAElF,IAAI,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE;QAClC,IAAA,mBAAU,EAAC,mBAAmB,WAAqB,gDAAgD,CAAC,CAAA;QAEpG,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QACrD,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAErD,IAAI;YACF,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAA,uBAAS,EAAC,QAAQ,CAAC;gBACnB,IAAA,uBAAS,EAAC,OAAO,CAAC;gBAClB,IAAA,uBAAS,EAAC,OAAO,CAAC;aACnB,CAAC,CAAA;SACH;QAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;YACzC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,GAAG,CAAA;SACtC;KACF;IAED,MAAM,IAAA,gBAAM,EAAC,UAAU,CAAC,CAAA;IAExB,IAAA,mBAAU,EAAC,WAAW,WAAqB;EAC3C,UAAU,EAAE,CAAC,CAAA;IACb,OAAO,SAAS,CAAA;AAClB,CAAC"}

package/lib/envUse.js

@@ -8,31 +8,20 @@ const fs_1 = require("fs");
 const graceful_fs_1 = __importDefault(require("graceful-fs"));
 const path_1 = __importDefault(require("path"));
 const error_1 = require("@pnpm/error");
-const fetch_1 = require("@pnpm/fetch");
-const node_resolver_1 = require("@pnpm/node.resolver");
 const cmd_shim_1 = __importDefault(require("@zkochan/cmd-shim"));
 const is_windows_1 = __importDefault(require("is-windows"));
 const symlink_dir_1 = __importDefault(require("symlink-dir"));
-const node_1 = require("./node");
-const getNodeMirror_1 = require("./getNodeMirror");
-const parseEnvSpecifier_1 = require("./parseEnvSpecifier");
 const utils_1 = require("./utils");
+const downloadNodeVersion_1 = require("./downloadNodeVersion");
 async function envUse(opts, params) {
     if (!opts.global) {
         throw new error_1.PnpmError('NOT_IMPLEMENTED_YET', '"pnpm env use <version>" can only be used with the "--global" option currently');
     }
-    const fetch = (0, fetch_1.createFetchFromRegistry)(opts);
-    const { releaseChannel, versionSpecifier } = (0, parseEnvSpecifier_1.parseEnvSpecifier)(params[0]);
-    const nodeMirrorBaseUrl = (0, getNodeMirror_1.getNodeMirror)(opts.rawConfig, releaseChannel);
-    const nodeVersion = await (0, node_resolver_1.resolveNodeVersion)(fetch, versionSpecifier, nodeMirrorBaseUrl);
-    if (!nodeVersion) {
+    const nodeInfo = await (0, downloadNodeVersion_1.downloadNodeVersion)(opts, params[0]);
+    if (!nodeInfo) {
         throw new error_1.PnpmError('COULD_NOT_RESOLVE_NODEJS', `Couldn't find Node.js version matching ${params[0]}`);
     }
-    const nodeDir = await (0, node_1.getNodeDir)(fetch, {
-        ...opts,
-        useNodeVersion: nodeVersion,
-        nodeMirrorBaseUrl,
-    });
+    const { nodeDir, nodeVersion } = nodeInfo;
     const src = (0, utils_1.getNodeExecPathInNodeDir)(nodeDir);
     const dest = (0, utils_1.getNodeExecPathInBinDir)(opts.bin);
     await (0, symlink_dir_1.default)(nodeDir, path_1.default.join(opts.pnpmHomeDir, utils_1.CURRENT_NODE_DIRNAME));

package/lib/envUse.js.map

@@ -1 +1 @@
-{"version":3,"file":"envUse.js","sourceRoot":"","sources":["../src/envUse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"envUse.js","sourceRoot":"","sources":["../src/envUse.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-env",
-  "version": "4.0.30",
+  "version": "4.1.0",
   "description": "pnpm commands for managing Node.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -33,13 +33,13 @@
     "semver": "^7.5.4",
     "symlink-dir": "^5.2.0",
     "write-json-file": "^4.3.0",
-    "@pnpm/cli-utils": "2.0.21",
-    "@pnpm/config": "19.1.0",
+    "@pnpm/config": "19.2.0",
+    "@pnpm/node.fetcher": "3.0.22",
     "@pnpm/error": "5.0.2",
-    "@pnpm/fetch": "7.0.3",
-    "@pnpm/node.fetcher": "3.0.21",
-    "@pnpm/node.resolver": "2.0.22",
-    "@pnpm/remove-bins": "5.0.3",
+    "@pnpm/cli-utils": "2.0.22",
+    "@pnpm/node.resolver": "2.0.23",
+    "@pnpm/fetch": "7.0.4",
+    "@pnpm/remove-bins": "5.0.4",
     "@pnpm/store-path": "8.0.0"
   },
   "funding": "https://opencollective.com/pnpm",
@@ -53,8 +53,8 @@
     "nock": "13.3.2",
     "node-fetch": "npm:@pnpm/node-fetch@1.0.0",
     "path-name": "^1.0.0",
-    "@pnpm/plugin-commands-env": "4.0.30",
-    "@pnpm/prepare": "0.0.80"
+    "@pnpm/plugin-commands-env": "4.1.0",
+    "@pnpm/prepare": "0.0.81"
   },
   "exports": {
     ".": "./lib/index.js"