From 3fda847b65f5c04eaff4beec1620db955caaf54c Mon Sep 17 00:00:00 2001 From: Pascal Date: Sat, 6 Aug 2022 18:25:53 -0400 Subject: [PATCH 1/3] Allow SapperAnchorProps & SvelteKitAnchorProps on svelte:element Ref: https://github.com/sveltejs/language-tools/issues/1576 --- packages/svelte2tsx/svelte-jsx.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/svelte2tsx/svelte-jsx.d.ts b/packages/svelte2tsx/svelte-jsx.d.ts index 052032c41..f6f158dbe 100644 --- a/packages/svelte2tsx/svelte-jsx.d.ts +++ b/packages/svelte2tsx/svelte-jsx.d.ts @@ -1456,7 +1456,7 @@ declare namespace svelte.JSX { sveltefragment: { slot?: string; }; svelteoptions: { [name: string]: any }; sveltehead: { [name: string]: any }; - svelteelement: { 'this': string | undefined | null; } & HTMLProps & SVGProps; + svelteelement: { 'this': string | undefined | null; } & HTMLProps & SVGProps & SapperAnchorProps & SvelteKitAnchorProps; [name: string]: { [name: string]: any }; } From e205e24e9134ace01b9a227aeb80c0a803e3646c Mon Sep 17 00:00:00 2001 From: Pascal Date: Sat, 6 Aug 2022 19:18:43 -0400 Subject: [PATCH 2/3] update samples for svelte-element --- .../test/svelte2tsx/samples/svelte-element/expected.tsx | 5 +++-- .../test/svelte2tsx/samples/svelte-element/expectedv2.ts | 5 +++-- .../test/svelte2tsx/samples/svelte-element/input.svelte | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expected.tsx index d82ed0b52..48dc367b6 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expected.tsx +++ b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expected.tsx @@ -9,8 +9,9 @@ {tag} - tag} />); + tag} /> +); return { props: {}, slots: {}, getters: {}, events: {} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { -} \ No newline at end of file +} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts index 64bbe6b03..ff17b1eaf 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts @@ -9,8 +9,9 @@ async () => { { svelteHTML.createElement("tag", { });} { svelteHTML.createElement(tag ? 'a' : 'b', { });} { svelteHTML.createElement(tag, { });tag; } - { svelteHTML.createElement(tag, { "onclick":() => tag,});}}; + { svelteHTML.createElement(tag, { "onclick":() => tag,});} + { svelteHTML.createElement('a', { "sveltekit:prefetch":true,"href":`https://kit.svelte.dev`,});}}; return { props: {}, slots: {}, getters: {}, events: {} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { -} \ No newline at end of file +} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/input.svelte index 7fe6fc406..ea16ac862 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/input.svelte +++ b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/input.svelte @@ -7,3 +7,4 @@ {tag} tag} /> + From f877cc4bc127d74a5cdb8b495ab51508738bf7af Mon Sep 17 00:00:00 2001 From: Pascal Date: Sat, 6 Aug 2022 19:19:19 -0400 Subject: [PATCH 3/3] update samples for sveltekit-anchor-attrs --- .../test/htmlx2jsx/samples/sveltekit-anchor-attrs/expected.jsx | 3 ++- .../htmlx2jsx/samples/sveltekit-anchor-attrs/expectedv2.js | 3 ++- .../test/htmlx2jsx/samples/sveltekit-anchor-attrs/input.svelte | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expected.jsx index 0f023660e..d17de542d 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expected.jsx +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expected.jsx @@ -1,3 +1,4 @@ <> - \ No newline at end of file + + diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expectedv2.js index d4478cdaa..9f6a1d403 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/expectedv2.js @@ -1,3 +1,4 @@ { svelteHTML.createElement("a", {"sveltekit:noscroll":true,}); } { svelteHTML.createElement("a", {"sveltekit:prefetch":true,}); } - { svelteHTML.createElement("a", {"sveltekit:reload":true,}); } \ No newline at end of file + { svelteHTML.createElement("a", {"sveltekit:reload":true,}); } + { svelteHTML.createElement("a", { "sveltekit:prefetch":true,}); } diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/input.svelte b/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/input.svelte index 7e888c35d..e24c3dbee 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/input.svelte +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/sveltekit-anchor-attrs/input.svelte @@ -1,3 +1,4 @@ +