From b13e0902e43b6f7e6e395052eb27b14a6a50ceb9 Mon Sep 17 00:00:00 2001 From: Ian Sutherland Date: Tue, 2 Jan 2018 12:28:46 -0700 Subject: [PATCH 1/3] feat(cli): improve error message when file resolver can't find file (#5134) --- src/reporters/lang/en.js | 3 ++- src/resolvers/exotics/file-resolver.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/reporters/lang/en.js b/src/reporters/lang/en.js index ac12f341b5..423ea40550 100644 --- a/src/reporters/lang/en.js +++ b/src/reporters/lang/en.js @@ -80,7 +80,8 @@ const messages = { invalidVersion: 'Invalid version supplied.', requiredVersionInRange: 'Required version in range.', packageNotFoundRegistry: "Couldn't find package $0 on the $1 registry.", - doesntExist: "$0 doesn't exist.", + doesntExist: + "$0 doesn't exist. It may have been moved or deleted. You can remove the package with the command: `yarn remove $1`", missingRequiredPackageKey: `Package $0 doesn't have a $1.`, invalidAccess: 'Invalid argument for access, expected public or restricted.', invalidCommand: 'Invalid subcommand. Try $0', diff --git a/src/resolvers/exotics/file-resolver.js b/src/resolvers/exotics/file-resolver.js index 1ee891336c..cea7c18dc9 100644 --- a/src/resolvers/exotics/file-resolver.js +++ b/src/resolvers/exotics/file-resolver.js @@ -49,7 +49,7 @@ export default class FileResolver extends ExoticResolver { return manifest; } if (!await fs.exists(loc)) { - throw new MessageError(this.reporter.lang('doesntExist', loc)); + throw new MessageError(this.reporter.lang('doesntExist', loc, this.pattern.split('@')[0])); } const manifest: Manifest = await (async () => { From 2e9ab96e8172f042c822dca5fa3159ab65667eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 15 Jan 2018 13:30:40 +0000 Subject: [PATCH 2/3] Update en.js --- src/reporters/lang/en.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/reporters/lang/en.js b/src/reporters/lang/en.js index 423ea40550..f511c65d0e 100644 --- a/src/reporters/lang/en.js +++ b/src/reporters/lang/en.js @@ -80,8 +80,7 @@ const messages = { invalidVersion: 'Invalid version supplied.', requiredVersionInRange: 'Required version in range.', packageNotFoundRegistry: "Couldn't find package $0 on the $1 registry.", - doesntExist: - "$0 doesn't exist. It may have been moved or deleted. You can remove the package with the command: `yarn remove $1`", + doesntExist: "Package $1 refer to a non-existing file '$0'.", missingRequiredPackageKey: `Package $0 doesn't have a $1.`, invalidAccess: 'Invalid argument for access, expected public or restricted.', invalidCommand: 'Invalid subcommand. Try $0', From f7ccba6985f95cfea6e99322de5fddd846e66658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 15 Jan 2018 13:30:59 +0000 Subject: [PATCH 3/3] Update en.js --- src/reporters/lang/en.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reporters/lang/en.js b/src/reporters/lang/en.js index f511c65d0e..dfd21502f3 100644 --- a/src/reporters/lang/en.js +++ b/src/reporters/lang/en.js @@ -80,7 +80,7 @@ const messages = { invalidVersion: 'Invalid version supplied.', requiredVersionInRange: 'Required version in range.', packageNotFoundRegistry: "Couldn't find package $0 on the $1 registry.", - doesntExist: "Package $1 refer to a non-existing file '$0'.", + doesntExist: "Package $1 refers to a non-existing file '$0'.", missingRequiredPackageKey: `Package $0 doesn't have a $1.`, invalidAccess: 'Invalid argument for access, expected public or restricted.', invalidCommand: 'Invalid subcommand. Try $0',