diff --git a/sites/svelte.dev/src/lib/server/tutorial/get-tutorial-data.js b/sites/svelte.dev/src/lib/server/tutorial/get-tutorial-data.js index c685ea504a..3709bf41d9 100644 --- a/sites/svelte.dev/src/lib/server/tutorial/get-tutorial-data.js +++ b/sites/svelte.dev/src/lib/server/tutorial/get-tutorial-data.js @@ -4,21 +4,8 @@ import { extract_frontmatter } from '../markdown'; const base = '../../site/content/tutorial/'; -/** @typedef {{ - * title: string; - * slug: string; - * tutorials: { - * title: string; - * slug: string; - * dir: string; - * content: string; - * initial: { name: string; type: string; content: string }[] - * complete: { name: string; type: string; content: string }[] - * }[]; - * }[]} TutorialData */ - /** - * @returns {TutorialData} + * @returns {import('./types').TutorialData} */ export function get_tutorial_data() { const tutorials = []; @@ -80,7 +67,7 @@ export function get_tutorial_data() { } /** - * @param {TutorialData} tutorial_data + * @param {import('./types').TutorialData} tutorial_data * @returns {import('./types').TutorialsList} */ export function get_tutorial_list(tutorial_data) { diff --git a/sites/svelte.dev/src/lib/server/tutorial/index.js b/sites/svelte.dev/src/lib/server/tutorial/index.js index d5c0957df9..04c33bf507 100644 --- a/sites/svelte.dev/src/lib/server/tutorial/index.js +++ b/sites/svelte.dev/src/lib/server/tutorial/index.js @@ -1,18 +1,10 @@ -import * as fs from 'fs'; -import * as path from 'path'; import { createShikiHighlighter } from 'shiki-twoslash'; -import { extract_frontmatter, transform } from '../markdown'; -// import { render, replace_placeholders } from './render.js'; -// import { parse_route_id } from '../../../../../../packages/kit/src/utils/routing.js'; -import { createHash } from 'crypto'; -import { normalizeSlugify } from '../docs'; - -const base = '../../site/content/tutorial/'; +import { transform } from '../markdown'; const languages = { bash: 'bash', env: 'bash', - html: 'html', + html: 'svelte', svelte: 'svelte', sv: 'svelte', js: 'javascript', @@ -23,7 +15,7 @@ const languages = { }; /** - * @param {import('./get-tutorial-data').TutorialData} tutorial_data + * @param {import('./types').TutorialData} tutorial_data * @param {string} slug */ export async function get_parsed_tutorial(tutorial_data, slug) { diff --git a/sites/svelte.dev/src/lib/server/tutorial/types.d.ts b/sites/svelte.dev/src/lib/server/tutorial/types.d.ts index 08dcd21ebd..2ec5bd99fb 100644 --- a/sites/svelte.dev/src/lib/server/tutorial/types.d.ts +++ b/sites/svelte.dev/src/lib/server/tutorial/types.d.ts @@ -1,3 +1,16 @@ +export type TutorialData = { + title: string; + slug: string; + tutorials: { + title: string; + slug: string; + dir: string; + content: string; + initial: { name: string; type: string; content: string }[]; + complete: { name: string; type: string; content: string }[]; + }[]; +}[]; + export interface Tutorial { title: string; slug: string;