From dd10d9ab474dfd72a5da78733c2eb630b6b9f158 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Mon, 29 Aug 2022 17:36:34 +0800 Subject: [PATCH] fix landing page --- apps/landing/package.json | 2 +- .../landing/src/pages/blog/post.page.server.ts | 18 +++++++++--------- apps/landing/src/pages/blog/post.page.tsx | 4 ++-- apps/landing/vite.config.ts | 8 ++++---- package.json | 3 --- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/apps/landing/package.json b/apps/landing/package.json index 0a41ad7a9..15a886cde 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -4,7 +4,7 @@ "dev": "pnpm run server", "prod": "pnpm run build && pnpm run server:prod", "vercel-build": "./vercel/deploy.sh", - "build": "vite build && vite build --ssr && vite-plugin-ssr prerender", + "build": "vite build && vite build", "server": "ts-node ./server", "server:prod": "cross-env NODE_ENV=production ts-node ./server", "lint": "eslint src/**/*.{ts,tsx} && tsc --noEmit" diff --git a/apps/landing/src/pages/blog/post.page.server.ts b/apps/landing/src/pages/blog/post.page.server.ts index 73d5a08a2..2a6f65bfb 100644 --- a/apps/landing/src/pages/blog/post.page.server.ts +++ b/apps/landing/src/pages/blog/post.page.server.ts @@ -1,15 +1,15 @@ import { PageContextBuiltIn } from 'vite-plugin-ssr'; -import { getPost, getPosts } from './api'; +import { getPost } from './api'; export async function onBeforeRender(pageContext: PageContextBuiltIn) { - const post = await getPost(pageContext.routeParams['slug']); + const post = await getPost(pageContext.routeParams['slug']); - return { - pageContext: { - pageProps: { - post - } - } - }; + return { + pageContext: { + pageProps: { + post + } + } + }; } diff --git a/apps/landing/src/pages/blog/post.page.tsx b/apps/landing/src/pages/blog/post.page.tsx index 150738380..efc6d3688 100644 --- a/apps/landing/src/pages/blog/post.page.tsx +++ b/apps/landing/src/pages/blog/post.page.tsx @@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet'; import '../../atom-one.css'; import { BlogTag } from '../../components/BlogTag'; -function MarkdownPage({ post }: { post: PostOrPage }) { +function Page({ post }: { post: PostOrPage }) { useEffect(() => { Prism.highlightAll(); }, []); @@ -72,4 +72,4 @@ function MarkdownPage({ post }: { post: PostOrPage }) { ); } -export { MarkdownPage }; +export { Page }; diff --git a/apps/landing/vite.config.ts b/apps/landing/vite.config.ts index 19e24436e..e1f271f21 100644 --- a/apps/landing/vite.config.ts +++ b/apps/landing/vite.config.ts @@ -1,7 +1,7 @@ -import react from '@vitejs/plugin-react' -import ssr from 'vite-plugin-ssr/plugin' -import { defineConfig } from 'vite' +import react from '@vitejs/plugin-react'; +import { defineConfig } from 'vite'; import md, { Mode } from 'vite-plugin-markdown'; +import ssr from 'vite-plugin-ssr/plugin'; import svg from 'vite-plugin-svgr'; export default defineConfig({ @@ -15,4 +15,4 @@ export default defineConfig({ port: 8003 }, publicDir: 'public' -}) +}); diff --git a/package.json b/package.json index 763f3442a..2c1dbe5bb 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,8 @@ "private": true, "scripts": { "prep": "pnpm db:gen", - "build": "turbo run build", - "landing-web": "turbo run dev --parallel --filter=@sd/landing --filter=@sd/web", "db:migrate": "pnpm core prisma migrate dev", "db:gen": "pnpm core prisma generate", - "lint": "turbo run lint", "format": "prettier --config .prettierrc.cli.js --write \"**/*.{ts,tsx,html,scss,json,yml,md}\"", "desktop": "pnpm --filter @sd/desktop --", "web": "pnpm --filter @sd/web -- ",