@yarnpkg/plugin-essentials 3.4.0 → 3.5.0

package/lib/commands/add.js

@@ -82,9 +82,9 @@ class AddCommand extends cli_1.BaseCommand {
                 : core_3.structUtils.tryParseDescriptor(pseudoDescriptor);
             const unsupportedPrefix = pseudoDescriptor.match(/^(https?:|git@github)/);
             if (unsupportedPrefix)
-                throw new clipanion_1.UsageError(`It seems you are trying to add a package using a ${core_1.formatUtils.pretty(configuration, `${unsupportedPrefix[0]}...`, core_1.FormatType.RANGE)} url; we now require package names to be explicitly specified.\nTry running the command again with the package name prefixed: ${core_1.formatUtils.pretty(configuration, `yarn add`, core_1.FormatType.CODE)} ${core_1.formatUtils.pretty(configuration, core_3.structUtils.makeDescriptor(core_3.structUtils.makeIdent(null, `my-package`), `${unsupportedPrefix[0]}...`), core_1.FormatType.DESCRIPTOR)}`);
+                throw new clipanion_1.UsageError(`It seems you are trying to add a package using a ${core_1.formatUtils.pretty(configuration, `${unsupportedPrefix[0]}...`, core_1.formatUtils.Type.RANGE)} url; we now require package names to be explicitly specified.\nTry running the command again with the package name prefixed: ${core_1.formatUtils.pretty(configuration, `yarn add`, core_1.formatUtils.Type.CODE)} ${core_1.formatUtils.pretty(configuration, core_3.structUtils.makeDescriptor(core_3.structUtils.makeIdent(null, `my-package`), `${unsupportedPrefix[0]}...`), core_1.formatUtils.Type.DESCRIPTOR)}`);
             if (!request)
-                throw new clipanion_1.UsageError(`The ${core_1.formatUtils.pretty(configuration, pseudoDescriptor, core_1.FormatType.CODE)} string didn't match the required format (package-name@range). Did you perhaps forget to explicitly reference the package name?`);
+                throw new clipanion_1.UsageError(`The ${core_1.formatUtils.pretty(configuration, pseudoDescriptor, core_1.formatUtils.Type.CODE)} string didn't match the required format (package-name@range). Did you perhaps forget to explicitly reference the package name?`);
             const targetList = suggestTargetList(workspace, request, {
                 dev: this.dev,
                 peer: this.peer,

package/lib/commands/link.d.ts

@@ -6,6 +6,6 @@ export default class LinkCommand extends BaseCommand {
     all: boolean;
     private: boolean;
     relative: boolean;
-    destination: string;
+    destinations: string[];
     execute(): Promise<1 | 0>;
 }

package/lib/commands/link.js

@@ -9,15 +9,15 @@ class LinkCommand extends cli_1.BaseCommand {
     constructor() {
         super(...arguments);
         this.all = clipanion_1.Option.Boolean(`-A,--all`, false, {
-            description: `Link all workspaces belonging to the target project to the current one`,
+            description: `Link all workspaces belonging to the target projects to the current one`,
         });
         this.private = clipanion_1.Option.Boolean(`-p,--private`, false, {
-            description: `Also link private workspaces belonging to the target project to the current one`,
+            description: `Also link private workspaces belonging to the target projects to the current one`,
         });
         this.relative = clipanion_1.Option.Boolean(`-r,--relative`, false, {
             description: `Link workspaces using relative paths instead of absolute paths`,
         });
-        this.destination = clipanion_1.Option.String();
+        this.destinations = clipanion_1.Option.Rest();
     }
     async execute() {
         const configuration = await core_1.Configuration.find(this.context.cwd, this.context.plugins);
@@ -28,29 +28,35 @@ class LinkCommand extends cli_1.BaseCommand {
         await project.restoreInstallState({
             restoreResolutions: false,
         });
-        const absoluteDestination = fslib_1.ppath.resolve(this.context.cwd, fslib_1.npath.toPortablePath(this.destination));
-        const configuration2 = await core_1.Configuration.find(absoluteDestination, this.context.plugins, { useRc: false, strict: false });
-        const { project: project2, workspace: workspace2 } = await core_1.Project.find(configuration2, absoluteDestination);
-        if (project.cwd === project2.cwd)
-            throw new clipanion_1.UsageError(`Invalid destination; Can't link the project to itself`);
-        if (!workspace2)
-            throw new cli_1.WorkspaceRequiredError(project2.cwd, absoluteDestination);
         const topLevelWorkspace = project.topLevelWorkspace;
         const linkedWorkspaces = [];
-        if (this.all) {
-            for (const workspace of project2.workspaces)
-                if (workspace.manifest.name && (!workspace.manifest.private || this.private))
-                    linkedWorkspaces.push(workspace);
-            if (linkedWorkspaces.length === 0) {
-                throw new clipanion_1.UsageError(`No workspace found to be linked in the target project`);
+        for (const destination of this.destinations) {
+            const absoluteDestination = fslib_1.ppath.resolve(this.context.cwd, fslib_1.npath.toPortablePath(destination));
+            const configuration2 = await core_1.Configuration.find(absoluteDestination, this.context.plugins, { useRc: false, strict: false });
+            const { project: project2, workspace: workspace2 } = await core_1.Project.find(configuration2, absoluteDestination);
+            if (project.cwd === project2.cwd)
+                throw new clipanion_1.UsageError(`Invalid destination '${destination}'; Can't link the project to itself`);
+            if (!workspace2)
+                throw new cli_1.WorkspaceRequiredError(project2.cwd, absoluteDestination);
+            if (this.all) {
+                let found = false;
+                for (const workspace of project2.workspaces) {
+                    if (workspace.manifest.name && (!workspace.manifest.private || this.private)) {
+                        linkedWorkspaces.push(workspace);
+                        found = true;
+                    }
+                }
+                if (!found) {
+                    throw new clipanion_1.UsageError(`No workspace found to be linked in the target project: ${destination}`);
+                }
+            }
+            else {
+                if (!workspace2.manifest.name)
+                    throw new clipanion_1.UsageError(`The target workspace at '${destination}' doesn't have a name and thus cannot be linked`);
+                if (workspace2.manifest.private && !this.private)
+                    throw new clipanion_1.UsageError(`The target workspace at '${destination}' is marked private - use the --private flag to link it anyway`);
+                linkedWorkspaces.push(workspace2);
             }
-        }
-        else {
-            if (!workspace2.manifest.name)
-                throw new clipanion_1.UsageError(`The target workspace doesn't have a name and thus cannot be linked`);
-            if (workspace2.manifest.private && !this.private)
-                throw new clipanion_1.UsageError(`The target workspace is marked private - use the --private flag to link it anyway`);
-            linkedWorkspaces.push(workspace2);
         }
         for (const workspace of linkedWorkspaces) {
             const fullName = core_1.structUtils.stringifyIdent(workspace.locator);
@@ -80,8 +86,8 @@ LinkCommand.usage = clipanion_1.Command.Usage({
       This command will set a new \`resolutions\` field in the project-level manifest and point it to the workspace at the specified location (even if part of another project).
     `,
     examples: [[
-            `Register a remote workspace for use in the current project`,
-            `$0 link ~/ts-loader`,
+            `Register one or more remote workspaces for use in the current project`,
+            `$0 link ~/ts-loader ~/jest`,
         ], [
             `Register all workspaces from a remote project for use in the current project`,
             `$0 link ~/jest --all`,

package/lib/commands/plugin/import.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BaseCommand } from '@yarnpkg/cli';
 import { Project, Report } from '@yarnpkg/core';
 import { Usage } from 'clipanion';

package/lib/commands/remove.js

@@ -89,7 +89,7 @@ class RemoveCommand extends cli_1.BaseCommand {
             ? `any`
             : `this`;
         if (unreferencedPatterns.length > 0)
-            throw new clipanion_1.UsageError(`${patterns} ${core_1.formatUtils.prettyList(configuration, unreferencedPatterns, core_1.FormatType.CODE)} ${dont} match any packages referenced by ${which} workspace`);
+            throw new clipanion_1.UsageError(`${patterns} ${core_1.formatUtils.prettyList(configuration, unreferencedPatterns, core_1.formatUtils.Type.CODE)} ${dont} match any packages referenced by ${which} workspace`);
         if (hasChanged) {
             await configuration.triggerMultipleHooks((hooks) => hooks.afterWorkspaceDependencyRemoval, afterWorkspaceDependencyRemovalList);
             const report = await core_2.StreamReport.start({

package/lib/commands/set/version.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BaseCommand } from '@yarnpkg/cli';
 import { Configuration, Report } from '@yarnpkg/core';
 import { Usage } from 'clipanion';

package/lib/commands/set/version.js

@@ -63,11 +63,11 @@ class SetVersionCommand extends cli_1.BaseCommand {
             const filePrefix = `file://`;
             let bundleBuffer;
             if (bundleUrl.startsWith(filePrefix)) {
-                report.reportInfo(core_1.MessageName.UNNAMED, `Downloading ${core_2.formatUtils.pretty(configuration, bundleUrl, core_1.FormatType.URL)}`);
+                report.reportInfo(core_1.MessageName.UNNAMED, `Downloading ${core_2.formatUtils.pretty(configuration, bundleUrl, core_2.formatUtils.Type.URL)}`);
                 bundleBuffer = await fslib_1.xfs.readFilePromise(fslib_1.npath.toPortablePath(bundleUrl.slice(filePrefix.length)));
             }
             else {
-                report.reportInfo(core_1.MessageName.UNNAMED, `Retrieving ${core_2.formatUtils.pretty(configuration, bundleUrl, core_1.FormatType.PATH)}`);
+                report.reportInfo(core_1.MessageName.UNNAMED, `Retrieving ${core_2.formatUtils.pretty(configuration, bundleUrl, core_2.formatUtils.Type.PATH)}`);
                 bundleBuffer = await core_2.httpUtils.get(bundleUrl, { configuration });
             }
             await setVersion(configuration, null, bundleBuffer, { report });

package/lib/commands/up.js

@@ -136,9 +136,9 @@ class UpCommand extends cli_1.BaseCommand {
             }
         }
         if (unreferencedPatterns.length > 1)
-            throw new clipanion_1.UsageError(`Patterns ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.FormatType.CODE)} don't match any packages referenced by any workspace`);
+            throw new clipanion_1.UsageError(`Patterns ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.formatUtils.Type.CODE)} don't match any packages referenced by any workspace`);
         if (unreferencedPatterns.length > 0)
-            throw new clipanion_1.UsageError(`Pattern ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.FormatType.CODE)} doesn't match any packages referenced by any workspace`);
+            throw new clipanion_1.UsageError(`Pattern ${core_3.formatUtils.prettyList(configuration, unreferencedPatterns, core_3.formatUtils.Type.CODE)} doesn't match any packages referenced by any workspace`);
         const allSuggestions = await Promise.all(allSuggestionsPromises);
         const checkReport = await core_3.LightReport.start({
             configuration,

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@yarnpkg/plugin-essentials",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "dependencies": {
-    "@yarnpkg/fslib": "^2.10.3",
+    "@yarnpkg/fslib": "^2.10.4",
     "@yarnpkg/parsers": "^2.6.0",
     "ci-info": "^3.2.0",
     "clipanion": "3.2.0-rc.4",
@@ -16,17 +16,17 @@
     "typanion": "^3.3.0"
   },
   "peerDependencies": {
-    "@yarnpkg/cli": "^3.7.0",
-    "@yarnpkg/core": "^3.6.0",
-    "@yarnpkg/plugin-git": "^2.6.7"
+    "@yarnpkg/cli": "^3.8.0",
+    "@yarnpkg/core": "^3.7.0",
+    "@yarnpkg/plugin-git": "^2.6.8"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.136",
     "@types/micromatch": "^4.0.1",
     "@types/semver": "^7.1.0",
-    "@yarnpkg/cli": "^3.7.0",
-    "@yarnpkg/core": "^3.6.0",
-    "@yarnpkg/plugin-git": "^2.6.7"
+    "@yarnpkg/cli": "^3.8.0",
+    "@yarnpkg/core": "^3.7.0",
+    "@yarnpkg/plugin-git": "^2.6.8"
   },
   "repository": {
     "type": "git",