(fix) data-sveltekit attributes are valid on all elements (#1773)

#1772
sveltejs · Dec 11, 2022 · 11b4ec7 · 11b4ec7
1 parent c366e2f
commit 11b4ec7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/packages/svelte2tsx/svelte-html-do-not-use.d.ts b/packages/svelte2tsx/svelte-html-do-not-use.d.ts
@@ -538,6 +538,12 @@ export interface HTMLAttributes<T extends EventTarget> extends AriaAttributes, D
 	 * Elements with the contenteditable attribute support innerHTML and textContent bindings.
 	 */
 	'bind:textContent'?: string | undefined | null;
+
+	// SvelteKit
+	'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
+	'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
+	'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
+	'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
 }
 
 export type HTMLAttributeAnchorTarget =
@@ -558,12 +564,6 @@ export interface HTMLAnchorAttributes extends HTMLAttributes<HTMLAnchorElement>
 	type?: string | undefined | null;
 	referrerpolicy?: ReferrerPolicy | undefined | null;
 
-	// SvelteKit
-	'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
-	'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
-	'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
-	'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
-
 	// Sapper
 	'sapper:noscroll'?: true | undefined | null;
 	'sapper:prefetch'?: true | undefined | null;

diff --git a/packages/svelte2tsx/svelte-jsx.d.ts b/packages/svelte2tsx/svelte-jsx.d.ts
@@ -839,6 +839,11 @@ declare namespace svelte.JSX {
       results?: number | undefined | null;
       security?: string | undefined | null;
       unselectable?: boolean | undefined | null;
+
+      'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
+      'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
+      'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
+      'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
     }
 
     // this list is "complete" in that it contains every SVG attribute
@@ -1176,13 +1181,6 @@ declare namespace svelte.JSX {
         sapperPrefetch?: true | undefined | null;
     }
 
-    interface SvelteKitAnchorProps {
-        'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
-        'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
-        'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
-        'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
-    }
-
     interface SvelteMediaTimeRange {
         start: number;
         end: number;
@@ -1221,7 +1219,7 @@ declare namespace svelte.JSX {
 
     interface IntrinsicElements {
       // HTML
-      a: HTMLProps<HTMLAnchorElement> & SapperAnchorProps & SvelteKitAnchorProps;
+      a: HTMLProps<HTMLAnchorElement> & SapperAnchorProps;
       abbr: HTMLProps<HTMLElement>;
       address: HTMLProps<HTMLElement>;
       area: HTMLProps<HTMLAreaElement>;
@@ -1398,7 +1396,7 @@ declare namespace svelte.JSX {
       sveltefragment: { slot?: string; };
       svelteoptions: { [name: string]: any };
       sveltehead: { [name: string]: any };
-      svelteelement: { 'this': string | undefined | null; } & HTMLProps<any> & SVGProps<any> & SapperAnchorProps & SvelteKitAnchorProps;
+      svelteelement: { 'this': string | undefined | null; } & HTMLProps<any> & SVGProps<any> & SapperAnchorProps;
       // Needed due to backwards compatibility type which hits these
       'svelte:window': HTMLProps<Window> & SvelteWindowProps;
       'svelte:body': HTMLProps<HTMLElement>;