From d94514cd059581cad4814a85f2d758602cecd341 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sun, 21 May 2023 00:06:18 +0100 Subject: [PATCH] feat: add typed pages and improve types --- nuxt.config.ts | 5 ++++- src/components/GithubRepos.vue | 1 + src/components/StaticMarkdownRender.ts | 14 ++++++-------- src/pages/blog/[article].vue | 2 +- src/server/api/sponsors.get.ts | 5 ++++- src/server/routes/auth/[...provider].get.ts | 5 ++++- src/server/routes/og/[slug].get.ts | 3 +-- src/server/utils/_chromium.ts | 2 +- src/server/utils/sponsors.ts | 2 +- test/e2e/ssr.spec.ts | 2 +- 10 files changed, 24 insertions(+), 17 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index a6bb366b..ad7150c9 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -31,7 +31,10 @@ export default defineNuxtConfig({ }, }, - experimental: { payloadExtraction: true, renderJsonPayloads: true }, + experimental: { + payloadExtraction: true, + typedPages: true, + }, sourcemap: false, diff --git a/src/components/GithubRepos.vue b/src/components/GithubRepos.vue index 54ada73e..e54a8efb 100644 --- a/src/components/GithubRepos.vue +++ b/src/components/GithubRepos.vue @@ -74,6 +74,7 @@ const { data: repos } = await useAsyncData('repos', () => { language: 'TypeScript', } } + // @ts-expect-error No typings for GH API const { stargazers_count: stars, language } = await $fetch( `https://api.github.com/repos/${repo}`, { diff --git a/src/components/StaticMarkdownRender.ts b/src/components/StaticMarkdownRender.ts index 5718a972..6d32fc14 100644 --- a/src/components/StaticMarkdownRender.ts +++ b/src/components/StaticMarkdownRender.ts @@ -3,7 +3,7 @@ import { createElementBlock } from 'vue' const cache: Record = {} const CacheHTMLDirective: Directive = { - created(el, binding) { + created (el, binding) { if (cache[binding.value]) { el.innerHTML = cache[binding.value] } else if (el.innerHTML && el.innerHTML !== '') { @@ -14,12 +14,10 @@ const CacheHTMLDirective: Directive = { export default defineComponent({ props: { - // eslint-disable-next-line vue/require-default-prop cacheKey: String, - // eslint-disable-next-line vue/require-default-prop value: Object, }, - setup(props) { + setup (props) { const key = props.cacheKey || useRoute().fullPath const nuxtApp = useNuxtApp() @@ -35,10 +33,10 @@ export default defineComponent({ process.client && !process.dev && shouldSkipRender() ? [] : [ - h(resolveComponent('LazyContentRendererMarkdown'), { - value: props.value, - }), - ] + h(resolveComponent('LazyContentRendererMarkdown'), { + value: props.value, + }), + ] ), [[CacheHTMLDirective, key]] ) diff --git a/src/pages/blog/[article].vue b/src/pages/blog/[article].vue index 7f66c81b..4a1e6168 100644 --- a/src/pages/blog/[article].vue +++ b/src/pages/blog/[article].vue @@ -35,7 +35,7 @@