From e5ab5b65ce25f4eab262591b1cce1316d68667f4 Mon Sep 17 00:00:00 2001 From: Puru Vijay Date: Fri, 3 Feb 2023 15:53:43 +0530 Subject: [PATCH] Rename markdown to blog --- .../src/lib/server/{markdown => blog}/index.js | 0 .../src/lib/server/{markdown => blog}/marked.js | 0 .../lib/server/{markdown => blog}/types.d.ts | 0 .../svelte.dev/src/routes/blog/+page.server.js | 4 ++-- .../src/routes/blog/[slug]/+page.server.js | 4 ++-- .../src/routes/blog/[slug]/card.png/+server.js | 17 +++++++++-------- .../src/routes/blog/rss.xml/+server.js | 10 +++++----- sites/svelte.dev/tsconfig.json | 5 +++++ 8 files changed, 23 insertions(+), 17 deletions(-) rename sites/svelte.dev/src/lib/server/{markdown => blog}/index.js (100%) rename sites/svelte.dev/src/lib/server/{markdown => blog}/marked.js (100%) rename sites/svelte.dev/src/lib/server/{markdown => blog}/types.d.ts (100%) diff --git a/sites/svelte.dev/src/lib/server/markdown/index.js b/sites/svelte.dev/src/lib/server/blog/index.js similarity index 100% rename from sites/svelte.dev/src/lib/server/markdown/index.js rename to sites/svelte.dev/src/lib/server/blog/index.js diff --git a/sites/svelte.dev/src/lib/server/markdown/marked.js b/sites/svelte.dev/src/lib/server/blog/marked.js similarity index 100% rename from sites/svelte.dev/src/lib/server/markdown/marked.js rename to sites/svelte.dev/src/lib/server/blog/marked.js diff --git a/sites/svelte.dev/src/lib/server/markdown/types.d.ts b/sites/svelte.dev/src/lib/server/blog/types.d.ts similarity index 100% rename from sites/svelte.dev/src/lib/server/markdown/types.d.ts rename to sites/svelte.dev/src/lib/server/blog/types.d.ts diff --git a/sites/svelte.dev/src/routes/blog/+page.server.js b/sites/svelte.dev/src/routes/blog/+page.server.js index 4a6091a9f5..0a1ca27d9f 100644 --- a/sites/svelte.dev/src/routes/blog/+page.server.js +++ b/sites/svelte.dev/src/routes/blog/+page.server.js @@ -1,9 +1,9 @@ -import { get_index } from '$lib/server/markdown'; +import { get_index } from '$lib/server/blog'; export const prerender = true; export async function load() { return { - posts: get_index() + posts: get_index(), }; } diff --git a/sites/svelte.dev/src/routes/blog/[slug]/+page.server.js b/sites/svelte.dev/src/routes/blog/[slug]/+page.server.js index 3f102cbf95..57005879b9 100644 --- a/sites/svelte.dev/src/routes/blog/[slug]/+page.server.js +++ b/sites/svelte.dev/src/routes/blog/[slug]/+page.server.js @@ -1,4 +1,4 @@ -import { get_post } from '$lib/server/markdown/index.js'; +import { get_post } from '$lib/server/blog/index.js'; import { error } from '@sveltejs/kit'; export const prerender = true; @@ -11,6 +11,6 @@ export async function load({ params }) { } return { - post + post, }; } diff --git a/sites/svelte.dev/src/routes/blog/[slug]/card.png/+server.js b/sites/svelte.dev/src/routes/blog/[slug]/card.png/+server.js index f199d24046..a63103765c 100644 --- a/sites/svelte.dev/src/routes/blog/[slug]/card.png/+server.js +++ b/sites/svelte.dev/src/routes/blog/[slug]/card.png/+server.js @@ -2,7 +2,7 @@ import satori from 'satori'; import { Resvg } from '@resvg/resvg-js'; import OverpassRegular from './Overpass-Regular.ttf'; import { html as toReactNode } from 'satori-html'; -import { get_post } from '$lib/server/markdown/index.js'; +import { get_post } from '$lib/server/blog/index.js'; import { error } from '@sveltejs/kit'; import Card from './Card.svelte'; @@ -19,6 +19,7 @@ export const GET = async ({ params, url }) => { throw error(404); } + // @ts-ignore const result = Card.render({ post }); const element = toReactNode(`${result.html}`); @@ -28,18 +29,18 @@ export const GET = async ({ params, url }) => { name: 'Overpass', data: Buffer.from(OverpassRegular), style: 'normal', - weight: 400 - } + weight: 400, + }, ], height, - width + width, }); const resvg = new Resvg(svg, { fitTo: { mode: 'width', - value: width - } + value: width, + }, }); const image = resvg.render(); @@ -47,7 +48,7 @@ export const GET = async ({ params, url }) => { return new Response(image.asPng(), { headers: { 'content-type': 'image/png', - 'cache-control': 'public, max-age=600' // cache for 10 minutes - } + 'cache-control': 'public, max-age=600', // cache for 10 minutes + }, }); }; diff --git a/sites/svelte.dev/src/routes/blog/rss.xml/+server.js b/sites/svelte.dev/src/routes/blog/rss.xml/+server.js index 2c9af085e8..353c634d75 100644 --- a/sites/svelte.dev/src/routes/blog/rss.xml/+server.js +++ b/sites/svelte.dev/src/routes/blog/rss.xml/+server.js @@ -1,4 +1,4 @@ -import { get_index } from '$lib/server/markdown'; +import { get_index } from '$lib/server/blog'; export const prerender = true; @@ -15,13 +15,13 @@ function escapeHTML(html) { "'": '#39', '&': 'amp', '<': 'lt', - '>': 'gt' + '>': 'gt', }; return html.replace(/["'&<>]/g, (c) => `&${chars[c]};`); } -/** @type {import('$lib/server/markdown/types').BlogPostSummary[]} */ +/** @param {import('$lib/server/blog/types').BlogPostSummary[]} posts */ const get_rss = (posts) => ` @@ -63,7 +63,7 @@ export async function GET() { return new Response(get_rss(posts), { headers: { 'Cache-Control': `max-age=${30 * 60 * 1e3}`, - 'Content-Type': 'application/rss+xml' - } + 'Content-Type': 'application/rss+xml', + }, }); } diff --git a/sites/svelte.dev/tsconfig.json b/sites/svelte.dev/tsconfig.json index 73f0a46d97..6484f32c51 100644 --- a/sites/svelte.dev/tsconfig.json +++ b/sites/svelte.dev/tsconfig.json @@ -1,3 +1,8 @@ { "extends": "./.svelte-kit/tsconfig.json", + "compilerOptions": { + "allowJs": true, + "checkJs": true, + "allowSyntheticDefaultImports": true + } }