From f529b2dc8e65602b690609cd5428a02b11edbbf8 Mon Sep 17 00:00:00 2001 From: "jyc.dev" Date: Thu, 6 Mar 2025 19:09:47 +0100 Subject: [PATCH 1/5] Assume no svelte 3 if can't read version with semver (pnpm calalog) --- packages/package/src/typescript.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/package/src/typescript.js b/packages/package/src/typescript.js index 12d1c32d710f..11c6c3567d42 100644 --- a/packages/package/src/typescript.js +++ b/packages/package/src/typescript.js @@ -28,7 +28,10 @@ export async function emit_dts(input, output, final_output, cwd, alias, files, t const require = createRequire(import.meta.url); const pkg = load_pkg_json(cwd); const svelte_dep = pkg.peerDependencies?.svelte || pkg.dependencies?.svelte || '3.0'; - const no_svelte_3 = !semver.intersects(svelte_dep, '^3.0.0'); + let no_svelte_3 = true + try { + no_svelte_3 = !semver.intersects(svelte_dep, '^3.0.0'); + } catch(e) { } await emitDts({ libRoot: input, svelteShimsPath: no_svelte_3 From 866d7ca0f0c4b4ab31d1ee21566afc137690db9b Mon Sep 17 00:00:00 2001 From: jycouet Date: Thu, 6 Mar 2025 19:33:11 +0100 Subject: [PATCH 2/5] better linting ;) --- packages/package/src/typescript.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/package/src/typescript.js b/packages/package/src/typescript.js index 11c6c3567d42..740715bbb19d 100644 --- a/packages/package/src/typescript.js +++ b/packages/package/src/typescript.js @@ -28,10 +28,14 @@ export async function emit_dts(input, output, final_output, cwd, alias, files, t const require = createRequire(import.meta.url); const pkg = load_pkg_json(cwd); const svelte_dep = pkg.peerDependencies?.svelte || pkg.dependencies?.svelte || '3.0'; - let no_svelte_3 = true + let no_svelte_3 = true; try { - no_svelte_3 = !semver.intersects(svelte_dep, '^3.0.0'); - } catch(e) { } + no_svelte_3 = !semver.intersects(svelte_dep, '^3.0.0'); + } catch (e) { + if (e instanceof Error) { + console.info(`Can't check svelte version ${svelte_dep}`, e.message); + } + } await emitDts({ libRoot: input, svelteShimsPath: no_svelte_3 From aa5e28cb12d316cd9c9d4e3f4738da945b9cb3bf Mon Sep 17 00:00:00 2001 From: "jyc.dev" Date: Mon, 17 Mar 2025 20:25:16 +0100 Subject: [PATCH 3/5] Update with suggestion Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- packages/package/src/typescript.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/package/src/typescript.js b/packages/package/src/typescript.js index 740715bbb19d..af65c475ae59 100644 --- a/packages/package/src/typescript.js +++ b/packages/package/src/typescript.js @@ -32,9 +32,8 @@ export async function emit_dts(input, output, final_output, cwd, alias, files, t try { no_svelte_3 = !semver.intersects(svelte_dep, '^3.0.0'); } catch (e) { - if (e instanceof Error) { - console.info(`Can't check svelte version ${svelte_dep}`, e.message); - } + if (!(e instanceof Error)) throw error; + console.info(`Can't check svelte version ${svelte_dep}`, e.message); } await emitDts({ libRoot: input, From f68f27a3741261f8ca6c433f56217046bd3f846e Mon Sep 17 00:00:00 2001 From: jycouet Date: Mon, 17 Mar 2025 20:26:50 +0100 Subject: [PATCH 4/5] fix typo & format --- packages/package/src/typescript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package/src/typescript.js b/packages/package/src/typescript.js index af65c475ae59..9bba74c689fa 100644 --- a/packages/package/src/typescript.js +++ b/packages/package/src/typescript.js @@ -32,7 +32,7 @@ export async function emit_dts(input, output, final_output, cwd, alias, files, t try { no_svelte_3 = !semver.intersects(svelte_dep, '^3.0.0'); } catch (e) { - if (!(e instanceof Error)) throw error; + if (!(e instanceof Error)) throw e; console.info(`Can't check svelte version ${svelte_dep}`, e.message); } await emitDts({ From 2f2ff0cdeaf3ce86496e35b123d962b2071e7cff Mon Sep 17 00:00:00 2001 From: "jyc.dev" Date: Tue, 18 Mar 2025 00:08:12 +0100 Subject: [PATCH 5/5] info to warn Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- packages/package/src/typescript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package/src/typescript.js b/packages/package/src/typescript.js index 9bba74c689fa..c74018dbb801 100644 --- a/packages/package/src/typescript.js +++ b/packages/package/src/typescript.js @@ -33,7 +33,7 @@ export async function emit_dts(input, output, final_output, cwd, alias, files, t no_svelte_3 = !semver.intersects(svelte_dep, '^3.0.0'); } catch (e) { if (!(e instanceof Error)) throw e; - console.info(`Can't check svelte version ${svelte_dep}`, e.message); + console.warn(`Can't check svelte version ${svelte_dep}`, e.message); } await emitDts({ libRoot: input,