From ec0431d2b041f25bb12d2de4efe4bc25bd9b0f62 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sun, 23 Nov 2025 04:47:26 -0800 Subject: [PATCH] fix: extract JSON-LD script generation to resolve parsing errors Refactor inline template literals with nested JSON.stringify() into separate derived variables. Fixes 6 ESLint parsing errors in route files. --- src/routes/+layout.svelte | 7 ++++++- src/routes/albums/[slug]/+page.svelte | 9 +++++++-- src/routes/labs/[slug]/+page.svelte | 9 +++++++-- src/routes/photos/[id]/+page.svelte | 9 +++++++-- src/routes/universe/[slug]/+page.svelte | 9 +++++++-- src/routes/work/[slug]/+page.svelte | 9 +++++++-- 6 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index b01fd61..048bf73 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -26,11 +26,16 @@ ] }) ) + + const personJsonLdScript = $derived( + // eslint-disable-next-line no-useless-escape + ` - {@html ``} + {@html personJsonLdScript}
diff --git a/src/routes/albums/[slug]/+page.svelte b/src/routes/albums/[slug]/+page.svelte index 6e54ed9..be24320 100644 --- a/src/routes/albums/[slug]/+page.svelte +++ b/src/routes/albums/[slug]/+page.svelte @@ -116,6 +116,11 @@ // Generate image gallery JSON-LD const galleryJsonLd = $derived(album ? generateAlbumJsonLd(album, pageUrl) : null) + + const galleryJsonLdScript = $derived( + // eslint-disable-next-line no-useless-escape -- Escape required for Svelte parser + galleryJsonLd ? ` @@ -136,8 +141,8 @@ - {#if galleryJsonLd} - {@html ``} + {#if galleryJsonLdScript} + {@html galleryJsonLdScript} {/if} diff --git a/src/routes/labs/[slug]/+page.svelte b/src/routes/labs/[slug]/+page.svelte index b597133..2a80878 100644 --- a/src/routes/labs/[slug]/+page.svelte +++ b/src/routes/labs/[slug]/+page.svelte @@ -48,6 +48,11 @@ }) : null ) + + const projectJsonLdScript = $derived( + // eslint-disable-next-line no-useless-escape -- Escape required for Svelte parser + projectJsonLd ? ` @@ -73,8 +78,8 @@ {/if} - {#if projectJsonLd} - {@html ``} + {#if projectJsonLdScript} + {@html projectJsonLdScript} {/if} diff --git a/src/routes/photos/[id]/+page.svelte b/src/routes/photos/[id]/+page.svelte index 54b122c..78873b1 100644 --- a/src/routes/photos/[id]/+page.svelte +++ b/src/routes/photos/[id]/+page.svelte @@ -85,6 +85,11 @@ : null ) + const photoJsonLdScript = $derived( + // eslint-disable-next-line no-useless-escape -- Escape required for Svelte parser + photoJsonLd ? ``} + {#if photoJsonLdScript} + {@html photoJsonLdScript} {/if} diff --git a/src/routes/universe/[slug]/+page.svelte b/src/routes/universe/[slug]/+page.svelte index ee4ef20..aeeaacf 100644 --- a/src/routes/universe/[slug]/+page.svelte +++ b/src/routes/universe/[slug]/+page.svelte @@ -56,6 +56,11 @@ }) : null ) + + const articleJsonLdScript = $derived( + // eslint-disable-next-line no-useless-escape -- Escape required for Svelte parser + articleJsonLd ? ` @@ -81,8 +86,8 @@ {/if} - {#if articleJsonLd} - {@html ``} + {#if articleJsonLdScript} + {@html articleJsonLdScript} {/if} diff --git a/src/routes/work/[slug]/+page.svelte b/src/routes/work/[slug]/+page.svelte index efb82f8..2aa4c4d 100644 --- a/src/routes/work/[slug]/+page.svelte +++ b/src/routes/work/[slug]/+page.svelte @@ -51,6 +51,11 @@ : null ) + const projectJsonLdScript = $derived( + // eslint-disable-next-line no-useless-escape -- Escape required for Svelte parser + projectJsonLd ? ``} + {#if projectJsonLdScript} + {@html projectJsonLdScript} {/if}