@yarnpkg/cli 3.2.0 → 4.0.0-rc.3

package/lib/main.js

@@ -52,11 +52,10 @@ async function main({ binaryVersion, pluginConfiguration }) {
     }
     async function exec(cli) {
         // Non-exhaustive known requirements:
-        // - 14.0 and 14.1 empty http responses - https://github.com/sindresorhus/got/issues/1496
-        // - 14.10.0 broken streams - https://github.com/nodejs/node/pull/34035 (fix: https://github.com/nodejs/node/commit/0f94c6b4e4)
+        // - 14.15 is the first LTS release
         var _a, _b, _c, _d, _e;
         const version = process.versions.node;
-        const range = `>=12 <14 || 14.2 - 14.9 || >14.10.0`;
+        const range = `>=14.15.0`;
         // YARN_IGNORE_NODE is special because this code needs to execute as early as possible.
         // It's not a regular core setting because Configuration.find may use functions not available
         // on older Node versions.
@@ -76,11 +75,11 @@ async function main({ binaryVersion, pluginConfiguration }) {
         const tryRead = (p) => fslib_1.xfs.readFilePromise(p).catch(() => {
             return Buffer.of();
         });
-        const isSameBinary = async () => yarnPath === selfPath ||
+        const isSameBinary = async () => yarnPath && (yarnPath === selfPath ||
             Buffer.compare(...await Promise.all([
                 tryRead(yarnPath),
                 tryRead(selfPath),
-            ])) === 0;
+            ])) === 0);
         // Avoid unnecessary spawn when run directly
         if (!ignorePath && !ignoreCwd && await isSameBinary()) {
             process.env.YARN_IGNORE_PATH = `1`;
@@ -116,7 +115,15 @@ async function main({ binaryVersion, pluginConfiguration }) {
                     cli.register(command);
                 }
             }
-            const command = cli.process(process.argv.slice(2));
+            const context = {
+                cwd: fslib_1.npath.toPortablePath(process.cwd()),
+                plugins: pluginConfiguration,
+                quiet: false,
+                stdin: process.stdin,
+                stdout: process.stdout,
+                stderr: process.stderr,
+            };
+            const command = cli.process(process.argv.slice(2), context);
             if (!command.help)
                 (_e = core_1.Configuration.telemetry) === null || _e === void 0 ? void 0 : _e.reportCommandName(command.path.join(` `));
             // @ts-expect-error: The cwd is a global option defined by BaseCommand
@@ -130,14 +137,7 @@ async function main({ binaryVersion, pluginConfiguration }) {
                     return;
                 }
             }
-            await cli.runExit(command, {
-                cwd: fslib_1.npath.toPortablePath(process.cwd()),
-                plugins: pluginConfiguration,
-                quiet: false,
-                stdin: process.stdin,
-                stdout: process.stdout,
-                stderr: process.stderr,
-            });
+            await cli.runExit(command, context);
         }
     }
     return run()

package/lib/pluginCommands.d.ts

@@ -1 +1 @@
-export declare const pluginCommands: Map<string, string[][]>;
+export declare const pluginCommands: Map<string, string[]>;

package/lib/pluginCommands.js

@@ -3,28 +3,4 @@
 // yarn build:plugin-commands
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginCommands = void 0;
-exports.pluginCommands = new Map([
-    [`constraints`, [
-            [`constraints`, `query`],
-            [`constraints`, `source`],
-            [`constraints`],
-        ]],
-    [`exec`, []],
-    [`interactive-tools`, [
-            [`search`],
-            [`upgrade-interactive`],
-        ]],
-    [`stage`, [
-            [`stage`],
-        ]],
-    [`typescript`, []],
-    [`version`, [
-            [`version`, `apply`],
-            [`version`, `check`],
-            [`version`],
-        ]],
-    [`workspace-tools`, [
-            [`workspaces`, `focus`],
-            [`workspaces`, `foreach`],
-        ]],
-]);
+exports.pluginCommands = new Map([]);

package/lib/tools/getDynamicLibs.js

@@ -11,7 +11,6 @@ const shell = tslib_1.__importStar(require("@yarnpkg/shell"));
 const clipanion = tslib_1.__importStar(require("clipanion"));
 const semver = tslib_1.__importStar(require("semver"));
 const typanion = tslib_1.__importStar(require("typanion"));
-const yup = tslib_1.__importStar(require("yup"));
 const getDynamicLibs = () => new Map([
     [`@yarnpkg/cli`, cli],
     [`@yarnpkg/core`, core],
@@ -23,7 +22,5 @@ const getDynamicLibs = () => new Map([
     [`clipanion`, clipanion],
     [`semver`, semver],
     [`typanion`, typanion],
-    // TODO: remove in next major
-    [`yup`, yup],
 ]);
 exports.getDynamicLibs = getDynamicLibs;

package/lib/tools/getPluginConfiguration.val.js

@@ -7,7 +7,7 @@ module.exports = ({modules, plugins}) => {
   }).join(``);
 
   const moduleSegment = `  modules: new Map([\n${modules.map((request, index) => {
-    return `    [${JSON.stringify(require(`${request}/package.json`).name)}, ${request === `clipanion` ? `backportClipanionCompatibility` : ``}(_${index})],\n`;
+    return `    [${JSON.stringify(require(`${request}/package.json`).name)}, _${index}],\n`;
   }).join(``)}  ]),\n`;
 
   const pluginSegment = `  plugins: new Set([\n${plugins.map(request => {
@@ -16,8 +16,6 @@ module.exports = ({modules, plugins}) => {
 
   return {
     code: [
-      `import {backportClipanionCompatibility} from './backportClipanionCompatibility';\n`,
-      `\n`,
       importSegment,
       `export const getPluginConfiguration = () => ({\n`,
       moduleSegment,

package/package.json

@@ -1,48 +1,52 @@
 {
   "name": "@yarnpkg/cli",
-  "version": "3.2.0",
+  "version": "4.0.0-rc.3",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
-    "@yarnpkg/core": "^3.2.0",
-    "@yarnpkg/fslib": "^2.6.1",
-    "@yarnpkg/libzip": "^2.2.3",
-    "@yarnpkg/parsers": "^2.5.0",
-    "@yarnpkg/plugin-compat": "^3.1.2",
-    "@yarnpkg/plugin-dlx": "^3.1.1",
-    "@yarnpkg/plugin-essentials": "^3.2.0",
-    "@yarnpkg/plugin-file": "^2.3.0",
-    "@yarnpkg/plugin-git": "^2.6.0",
-    "@yarnpkg/plugin-github": "^2.3.0",
-    "@yarnpkg/plugin-http": "^2.2.0",
-    "@yarnpkg/plugin-init": "^3.1.2",
-    "@yarnpkg/plugin-link": "^2.2.0",
-    "@yarnpkg/plugin-nm": "^3.1.1",
-    "@yarnpkg/plugin-npm": "^2.7.0",
-    "@yarnpkg/plugin-npm-cli": "^3.2.0",
-    "@yarnpkg/plugin-pack": "^3.1.1",
-    "@yarnpkg/plugin-patch": "^3.2.0",
-    "@yarnpkg/plugin-pnp": "^3.2.0",
-    "@yarnpkg/plugin-pnpm": "^1.1.0",
-    "@yarnpkg/shell": "^3.2.0",
-    "chalk": "^3.0.0",
+    "@yarnpkg/core": "^4.0.0-rc.3",
+    "@yarnpkg/fslib": "^3.0.0-rc.3",
+    "@yarnpkg/libzip": "^3.0.0-rc.3",
+    "@yarnpkg/parsers": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-compat": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-constraints": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-dlx": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-essentials": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-exec": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-file": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-git": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-github": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-http": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-init": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-interactive-tools": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-link": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-nm": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-npm": "^3.0.0-rc.3",
+    "@yarnpkg/plugin-npm-cli": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-pack": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-patch": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-pnp": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-pnpm": "^2.0.0-rc.3",
+    "@yarnpkg/plugin-stage": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-typescript": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-version": "^4.0.0-rc.3",
+    "@yarnpkg/plugin-workspace-tools": "^4.0.0-rc.3",
+    "@yarnpkg/shell": "^4.0.0-rc.3",
     "ci-info": "^3.2.0",
-    "clipanion": "^3.2.0-rc.4",
+    "clipanion": "^3.2.0-rc.10",
     "semver": "^7.1.2",
     "tslib": "^1.13.0",
-    "typanion": "^3.3.0",
-    "yup": "^0.32.9"
+    "typanion": "^3.3.0"
   },
   "devDependencies": {
     "@types/semver": "^7.1.0",
-    "@types/yup": "^0",
-    "@yarnpkg/builder": "^3.2.0",
+    "@yarnpkg/builder": "^4.0.0-rc.3",
     "@yarnpkg/monorepo": "^0.0.0",
-    "@yarnpkg/pnpify": "^3.1.1",
+    "@yarnpkg/pnpify": "^4.0.0-rc.3",
     "micromatch": "^4.0.2"
   },
   "peerDependencies": {
-    "@yarnpkg/core": "^3.2.0"
+    "@yarnpkg/core": "^4.0.0-rc.3"
   },
   "scripts": {
     "postpack": "rm -rf lib",
@@ -67,12 +71,15 @@
       "standard": [
         "@yarnpkg/plugin-essentials",
         "@yarnpkg/plugin-compat",
+        "@yarnpkg/plugin-constraints",
         "@yarnpkg/plugin-dlx",
+        "@yarnpkg/plugin-exec",
         "@yarnpkg/plugin-file",
         "@yarnpkg/plugin-git",
         "@yarnpkg/plugin-github",
         "@yarnpkg/plugin-http",
         "@yarnpkg/plugin-init",
+        "@yarnpkg/plugin-interactive-tools",
         "@yarnpkg/plugin-link",
         "@yarnpkg/plugin-nm",
         "@yarnpkg/plugin-npm",
@@ -80,7 +87,11 @@
         "@yarnpkg/plugin-pack",
         "@yarnpkg/plugin-patch",
         "@yarnpkg/plugin-pnp",
-        "@yarnpkg/plugin-pnpm"
+        "@yarnpkg/plugin-pnpm",
+        "@yarnpkg/plugin-stage",
+        "@yarnpkg/plugin-typescript",
+        "@yarnpkg/plugin-version",
+        "@yarnpkg/plugin-workspace-tools"
       ]
     }
   },
@@ -90,7 +101,8 @@
     "directory": "packages/yarnpkg-cli"
   },
   "engines": {
-    "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
+    "node": ">=14.15.0"
   },
+  "stableVersion": "3.2.0",
   "types": "./lib/index.d.ts"
 }

package/lib/tools/backportClipanionCompatibility.d.ts

@@ -1 +0,0 @@
-export declare function backportClipanionCompatibility(clipanion: any): any;

package/lib/tools/backportClipanionCompatibility.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.backportClipanionCompatibility = void 0;
-function backportClipanionCompatibility(clipanion) {
-    clipanion.Command.Path = (...p) => (instance) => {
-        instance.paths = instance.paths || [];
-        instance.paths.push(p);
-    };
-    for (const fn of [`Array`, `Boolean`, `String`, `Proxy`, `Rest`, `Counter`]) {
-        clipanion.Command[fn] = (...args) => (instance, propertyName) => {
-            const value = clipanion.Option[fn](...args);
-            Object.defineProperty(instance, `__${propertyName}`, {
-                configurable: false,
-                enumerable: true,
-                get() {
-                    return value;
-                },
-                set(value) {
-                    this[propertyName] = value;
-                },
-            });
-        };
-    }
-    return clipanion;
-}
-exports.backportClipanionCompatibility = backportClipanionCompatibility;