From 42b07533d8251fc45f02f93f1814a01132881dfe Mon Sep 17 00:00:00 2001 From: Chew Tee Ming Date: Fri, 17 Jan 2025 16:17:35 +0800 Subject: [PATCH 1/2] catch error when resolving dep --- packages/kit/src/utils/import.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/kit/src/utils/import.js b/packages/kit/src/utils/import.js index 1c55a14c9b2f..42badbb2a931 100644 --- a/packages/kit/src/utils/import.js +++ b/packages/kit/src/utils/import.js @@ -11,10 +11,14 @@ export async function resolve_peer_dependency(dependency) { try { // @ts-expect-error the types are wrong const resolved = imr.resolve(dependency, pathToFileURL(process.cwd() + '/dummy.js')); - return await import(resolved).catch(() => import(dependency)); + return await import(resolved); } catch { - throw new Error( - `Could not resolve peer dependency "${dependency}" relative to your project — please install it and try again.` - ); + try { + return await import(dependency); + } catch { + throw new Error( + `Could not resolve peer dependency "${dependency}" relative to your project — please install it and try again.` + ); + } } } From b2c6c8fb0e59eb1a131515b74d985c1168375b05 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:04:28 +0100 Subject: [PATCH 2/2] Update packages/kit/src/utils/import.js --- packages/kit/src/utils/import.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kit/src/utils/import.js b/packages/kit/src/utils/import.js index 42badbb2a931..4a8e92971f16 100644 --- a/packages/kit/src/utils/import.js +++ b/packages/kit/src/utils/import.js @@ -14,6 +14,7 @@ export async function resolve_peer_dependency(dependency) { return await import(resolved); } catch { try { + // both imr.resolve and await import above can throw, which is why we can't just do import(resolved).catch(...) above return await import(dependency); } catch { throw new Error(