diff --git a/src/adapters/sveltekit.templates.ts b/src/adapters/sveltekit.templates.ts index 99b229a7..77cc8493 100644 --- a/src/adapters/sveltekit.templates.ts +++ b/src/adapters/sveltekit.templates.ts @@ -67,20 +67,8 @@ export function prismicIOFileTemplate({ typescript }: { typescript: boolean }): `; } -export function sliceSimulatorPageTemplate({ version }: { version: number }): string { - const v5 = dedent` - - - - - - - `; - - const v4 = dedent` +export function sliceSimulatorPageTemplate(): string { + return dedent` - ${HEAD_MARKUP} + + {page.data.page?.data.meta_title} + + {#if isFilled.keyText(page.data.page?.data.meta_description)} + + + {/if} + {#if isFilled.image(page.data.page?.data.meta_image)} + + {/if} + {@render children()} `; - - const v4 = dedent` - - - ${HEAD_MARKUP} - - - `; - - return version <= 4 ? v4 : v5; } export function pageTemplate({ typescript }: { typescript: boolean }): string { @@ -277,31 +243,25 @@ const SLICE_MARKUP = dedent` `; -export function sliceTemplate({ - name, - typescript, - version, -}: { - name: string; - typescript: boolean; - version: number; -}): string { +export function sliceTemplate({ name, typescript }: { name: string; typescript: boolean }): string { const pascalName = pascalCase(name); - const v5TS = dedent` - + const { slice }: Props = $props(); + - ${SLICE_MARKUP} - `; + ${SLICE_MARKUP} + `; + } - const v5JS = dedent` + return dedent` - - ${SLICE_MARKUP} - `; - - const v4JS = dedent` - - - ${SLICE_MARKUP} - `; - - if (typescript) { - return version <= 4 ? v4TS : v5TS; - } - - return version <= 4 ? v4JS : v5JS; } diff --git a/src/adapters/sveltekit.ts b/src/adapters/sveltekit.ts index d43d5d6b..d05f3dc5 100644 --- a/src/adapters/sveltekit.ts +++ b/src/adapters/sveltekit.ts @@ -8,7 +8,6 @@ import { pascalCase } from "change-case"; import { Adapter, checkSourceContains, - getInstalledMajor, getJsFileExtension, type PageFile, writeFileIfMissing, @@ -54,7 +53,6 @@ export class SvelteKitAdapter extends Adapter { const projectRoot = await findProjectRoot(); const extension = await getJsFileExtension(); const typescript = await checkIsTypeScriptProject(); - const version = await getInstalledMajor("svelte"); await writeFileIfMissing( new URL(`src/lib/prismicio.${extension}`, projectRoot), @@ -62,7 +60,7 @@ export class SvelteKitAdapter extends Adapter { ); await writeFileIfMissing( new URL("src/routes/slice-simulator/+page.svelte", projectRoot), - sliceSimulatorPageTemplate({ version }), + sliceSimulatorPageTemplate(), ); await writeFileIfMissing( new URL(`src/params/preview.${extension}`, projectRoot), @@ -104,7 +102,7 @@ export class SvelteKitAdapter extends Adapter { if (returnsRepositoryName) { await writeFileIfMissing( new URL("src/routes/+layout.svelte", projectRoot), - rootLayoutTemplate({ version }), + rootLayoutTemplate(), ); } await deleteStarterHomePage(); @@ -132,34 +130,6 @@ export class SvelteKitAdapter extends Adapter { private async getPreviewStep(): Promise { if (await checkSourceContains("PrismicPreview")) return; - const layoutStep = - (await getInstalledMajor("svelte")) <= 4 - ? dedent` - Add the lines marked + to src/routes/+layout.svelte: - - - - - + - ` - : dedent` - Change the lines marked - and + in src/routes/+layout.svelte: - - - - {@render children()} - + - `; - // The layout reads repositoryName from the server layout's data. const serverLayoutPath = (await findServerLayout()) ?? `src/routes/+layout.server.${await getJsFileExtension()}`; @@ -177,8 +147,19 @@ export class SvelteKitAdapter extends Adapter { Previews do not work until you do this, and the CLI cannot edit your layout for you. Make the change now. + + Change the lines marked - and + in src/routes/+layout.svelte: + + + + {@render children()} + + `, - layoutStep, serverLayoutStep, "Run `prismic docs view sveltekit` for details.", ] @@ -215,7 +196,6 @@ export class SvelteKitAdapter extends Adapter { const contents = sliceTemplate({ name: model.name, typescript: await checkIsTypeScriptProject(), - version: await getInstalledMajor("svelte"), }); await writeFileRecursive(new URL("index.svelte", directory), contents); } diff --git a/test/gen-setup.test.ts b/test/gen-setup.test.ts index 17cfa028..2594b30c 100644 --- a/test/gen-setup.test.ts +++ b/test/gen-setup.test.ts @@ -40,17 +40,8 @@ it( "generates valid script tags for SvelteKit", { timeout: 30_000 }, async ({ expect, project, prismic }) => { - // Reconfigure the fixture as a SvelteKit project so a file with a