From 269fbaabef025197d087fa410495caefa217f21d Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Tue, 26 Mar 2024 23:35:51 -0500 Subject: [PATCH 1/8] [cli] add information link to web platform metro error --- packages/@expo/cli/src/export/resolveOptions.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index b9ca79251f2a8..3d1ccc4aeb9ff 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -39,11 +39,18 @@ export function resolvePlatformOption( // Pass through so the more robust error message is shown. return platform; } + + let error = `Platform "${platform}" is not configured to use the Metro bundler in the project Expo config, or is missing from the supported platforms in the platforms array: [${exp.platforms?.join( + ', ' + )}].` + + if (platform === 'web') { + error += ' More information: https://docs.expo.dev/guides/customizing-metro/#adding-web-support-to-metro.' + } + throw new CommandError( 'BAD_ARGS', - `Platform "${platform}" is not configured to use the Metro bundler in the project Expo config, or is missing from the supported platforms in the platforms array: [${exp.platforms?.join( - ', ' - )}].` + error ); } From 2e675b6403380be47f4aea02840a0393556876aa Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Tue, 26 Mar 2024 23:55:54 -0500 Subject: [PATCH 2/8] linting --- packages/@expo/cli/src/export/resolveOptions.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index 3d1ccc4aeb9ff..6af5c75639da0 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -42,16 +42,14 @@ export function resolvePlatformOption( let error = `Platform "${platform}" is not configured to use the Metro bundler in the project Expo config, or is missing from the supported platforms in the platforms array: [${exp.platforms?.join( ', ' - )}].` + )}].`; if (platform === 'web') { - error += ' More information: https://docs.expo.dev/guides/customizing-metro/#adding-web-support-to-metro.' + error += + ' More information: https://docs.expo.dev/guides/customizing-metro/#adding-web-support-to-metro.' } - throw new CommandError( - 'BAD_ARGS', - error - ); + throw new CommandError('BAD_ARGS', error); } return platform; From 09bb31e56af7fca70c50a06408881beabd637563 Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Wed, 27 Mar 2024 00:03:30 -0500 Subject: [PATCH 3/8] more linting --- packages/@expo/cli/src/export/resolveOptions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index 6af5c75639da0..af021b4db9ef9 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -45,8 +45,8 @@ export function resolvePlatformOption( )}].`; if (platform === 'web') { - error += - ' More information: https://docs.expo.dev/guides/customizing-metro/#adding-web-support-to-metro.' + error += + ' More information: https://docs.expo.dev/guides/customizing-metro/#adding-web-support-to-metro.'; } throw new CommandError('BAD_ARGS', error); From 55facb59443cd1c4dea1a9a2211e83f754ff71a7 Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Wed, 27 Mar 2024 16:11:15 -0500 Subject: [PATCH 4/8] use learnMore and update URL --- packages/@expo/cli/src/export/resolveOptions.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index af021b4db9ef9..7fcb2d98cf970 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -2,6 +2,7 @@ import { ExpoConfig, getConfig, Platform } from '@expo/config'; import { getPlatformBundlers, PlatformBundlers } from '../start/server/platformBundlers'; import { CommandError } from '../utils/errors'; +import { learnMore } from '../utils/link'; export type Options = { outputDir: string; @@ -46,7 +47,7 @@ export function resolvePlatformOption( if (platform === 'web') { error += - ' More information: https://docs.expo.dev/guides/customizing-metro/#adding-web-support-to-metro.'; + ' ' + learnMore("https://docs.expo.dev/guides/customizing-metro/#web-support"); } throw new CommandError('BAD_ARGS', error); From 6169bab880c50abc251b53d0dd93264656172add Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Wed, 27 Mar 2024 16:29:10 -0500 Subject: [PATCH 5/8] linting --- packages/@expo/cli/src/export/resolveOptions.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index 7fcb2d98cf970..9957cb919518b 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -46,8 +46,7 @@ export function resolvePlatformOption( )}].`; if (platform === 'web') { - error += - ' ' + learnMore("https://docs.expo.dev/guides/customizing-metro/#web-support"); + error += ' ' + learnMore("https://docs.expo.dev/guides/customizing-metro/#web-support"); } throw new CommandError('BAD_ARGS', error); From 430203107ac5105a9f0523c3e9bde5add00fe171 Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Wed, 27 Mar 2024 16:45:05 -0500 Subject: [PATCH 6/8] linting --- packages/@expo/cli/src/export/resolveOptions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index 9957cb919518b..600c8899a9b68 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -46,7 +46,7 @@ export function resolvePlatformOption( )}].`; if (platform === 'web') { - error += ' ' + learnMore("https://docs.expo.dev/guides/customizing-metro/#web-support"); + error += ' ' + learnMore('https://docs.expo.dev/guides/customizing-metro/#web-support'); } throw new CommandError('BAD_ARGS', error); From a46a3b2c7b71e6934b2ba84f33cb02462b922cd1 Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Tue, 2 Apr 2024 12:31:32 -0500 Subject: [PATCH 7/8] Update packages/@expo/cli/src/export/resolveOptions.ts Co-authored-by: Brent Vatne --- packages/@expo/cli/src/export/resolveOptions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index 600c8899a9b68..550f96277c622 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -46,7 +46,7 @@ export function resolvePlatformOption( )}].`; if (platform === 'web') { - error += ' ' + learnMore('https://docs.expo.dev/guides/customizing-metro/#web-support'); + error = `${error} ${learnMore('https://docs.expo.dev/guides/customizing-metro/#web-support')}`; } throw new CommandError('BAD_ARGS', error); From a35ee05208078223404ac8e6637cb58dc2431fe8 Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Tue, 9 Apr 2024 08:15:54 -0400 Subject: [PATCH 8/8] linting --- packages/@expo/cli/src/export/resolveOptions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/@expo/cli/src/export/resolveOptions.ts b/packages/@expo/cli/src/export/resolveOptions.ts index 550f96277c622..b89550b830356 100644 --- a/packages/@expo/cli/src/export/resolveOptions.ts +++ b/packages/@expo/cli/src/export/resolveOptions.ts @@ -46,7 +46,9 @@ export function resolvePlatformOption( )}].`; if (platform === 'web') { - error = `${error} ${learnMore('https://docs.expo.dev/guides/customizing-metro/#web-support')}`; + error = `${error} ${learnMore( + 'https://docs.expo.dev/guides/customizing-metro/#web-support' + )}`; } throw new CommandError('BAD_ARGS', error);