From cfbc0124d64ea8344604cfd8f44045b740d3ed65 Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Sun, 14 May 2023 03:13:20 +0800 Subject: [PATCH] Use Build Output API for landing page (#819) * build output api * deploy * fix blog posts * maybe idk * remove vercel-build --- apps/landing/package.json | 3 +- apps/landing/server/index.ts | 2 +- apps/landing/src/App.tsx | 2 +- apps/landing/src/pages/blog/index.page.tsx | 58 ++++++++-------- .../src/pages/blog/post.page.server.ts | 4 +- apps/landing/src/pages/blog/post.page.tsx | 62 +++++++++--------- .../landing/src/pages/docs/doc.page.server.ts | 2 +- apps/landing/vite.config.ts | 8 ++- pnpm-lock.yaml | Bin 712261 -> 713657 bytes 9 files changed, 70 insertions(+), 71 deletions(-) diff --git a/apps/landing/package.json b/apps/landing/package.json index 181e4447e..0568292e8 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -3,7 +3,6 @@ "scripts": { "dev": "pnpm run server", "prod": "pnpm run build && pnpm run server:prod", - "vercel-build": "./vercel/deploy.sh", "build": "vite build", "server": "ts-node ./server", "server:prod": "cross-env NODE_ENV=production ts-node ./server", @@ -38,6 +37,7 @@ "vite-plugin-ssr": "^0.4.39" }, "devDependencies": { + "@magne4000/vite-plugin-vercel-ssr": "^0.1.5", "@sd/config": "workspace:*", "@sd/ui": "workspace:*", "@tailwindcss/line-clamp": "^0.4.2", @@ -57,6 +57,7 @@ "vite-plugin-esmodule": "^1.4.4", "vite-plugin-markdown": "^2.1.0", "vite-plugin-svgr": "^2.2.1", + "vite-plugin-vercel": "^0.1.7", "vite-tsconfig-paths": "^3.5.2" } } diff --git a/apps/landing/server/index.ts b/apps/landing/server/index.ts index a1f15fe29..e5961cd3d 100644 --- a/apps/landing/server/index.ts +++ b/apps/landing/server/index.ts @@ -1,6 +1,6 @@ import compression from 'compression'; import express from 'express'; -import { renderPage } from 'vite-plugin-ssr'; +import { renderPage } from 'vite-plugin-ssr/server'; const isProduction = process.env.NODE_ENV === 'production'; const root = `${__dirname}/..`; diff --git a/apps/landing/src/App.tsx b/apps/landing/src/App.tsx index edae5f4f0..f0a996ea9 100644 --- a/apps/landing/src/App.tsx +++ b/apps/landing/src/App.tsx @@ -1,5 +1,5 @@ import React, { PropsWithChildren } from 'react'; -import { PageContextBuiltIn } from 'vite-plugin-ssr'; +import { PageContextBuiltIn } from 'vite-plugin-ssr/types'; import '@sd/ui/style'; import { Footer } from './components/Footer'; import NavBar from './components/NavBar'; diff --git a/apps/landing/src/pages/blog/index.page.tsx b/apps/landing/src/pages/blog/index.page.tsx index 241d3bac8..113f4c3c9 100644 --- a/apps/landing/src/pages/blog/index.page.tsx +++ b/apps/landing/src/pages/blog/index.page.tsx @@ -15,37 +15,35 @@ function Page({ posts }: { posts: BlogPosts }) {

Get the latest from Spacedrive.

- {postsArray.map((post) => { - return ( - - {post.image && ( - - )} -
-

{post.title}

- {post.readTime} minute read. - {/*

{post.excerpt}

*/} -

- by {post.author} ·{' '} - {new Date(post.date ?? '').toLocaleDateString()} -

-
- {post.tags?.map((tag) => ( - - ))} -
+ {postsArray.map((post) => ( + + {post.image && ( + + )} +
+

{post.title}

+ {post.readTime} minute read. + {/*

{post.excerpt}

*/} +

+ by {post.author} ·{' '} + {new Date(post.date ?? '').toLocaleDateString()} +

+
+ {post.tags?.map((tag) => ( + + ))}
- - ); - })} +
+ + ))}
); diff --git a/apps/landing/src/pages/blog/post.page.server.ts b/apps/landing/src/pages/blog/post.page.server.ts index 7c39426e9..126b7b081 100644 --- a/apps/landing/src/pages/blog/post.page.server.ts +++ b/apps/landing/src/pages/blog/post.page.server.ts @@ -1,5 +1,5 @@ -import { PageContextBuiltIn } from 'vite-plugin-ssr'; -import { getBlogPost, getBlogPosts } from './api'; +import { PageContextBuiltIn } from 'vite-plugin-ssr/types'; +import { getBlogPost } from './api'; export const passToClient = ['pageProps']; diff --git a/apps/landing/src/pages/blog/post.page.tsx b/apps/landing/src/pages/blog/post.page.tsx index 758462dc9..f386023eb 100644 --- a/apps/landing/src/pages/blog/post.page.tsx +++ b/apps/landing/src/pages/blog/post.page.tsx @@ -30,38 +30,36 @@ function Page({ post }: { post: BlogPost }) {
- <> -
- {/*
*/} - -
-
-
-

- {post?.title} -

-

- by {post?.author} ·{' '} - {new Date(post?.date ?? '').toLocaleDateString()} -

-
-
- {post.tags?.map((tag) => ( - - ))} -
-
-
+
+
+ {post.tags?.map((tag) => ( + + ))} +
+ +
*zBks=ZWsuOkHPfbw!=y=@nRYsD)21&$7W39LP1>eO z+jNS{j(C`ph~)5FM8)HX7iAAcQ1Bvp5d{AL@#0bRvg~OvG9Y-_2R_f~IXutv{rvDP z`pu8%SAV{8f2f!vgC+<9pIcKS%-7NNOmis z`(X3w;hpbe;lsDr<2SP*i`)(6^s7)d{Aefn{`Jo4dIvgu>m|oh72h|!=@Ee)fW0eZ zUz*{)89Hc+l76PEr`0oILb?vu>!UV>cLohrXf=DIV%j?%HEObsviY`4bgYqhVD-GB zeJ)g&6?HjhPOLgjJ2EY0WWf^v+k=v;bO&mG4u1O#c>p83yEvHqoY-D{{T%vu<7rSUK>*y6dVC?j1{oLRcp<)-rR<>R&P3W}N(5P(CSd4-tnPWM( zbzBp9b;y{NtT*Yaf{u1=zs&@J8&Kj5{Qb#V^0EZoidb8fAox229QNS&ZErlAS|c+R zb;m!VK>ZKsb;({C zLR~lYj2w)-0ot4|>v_{Gk85=?L$~Z!mpNU6_kM}J2H-d2FUK+%i4oxXox~pa=|gxE z5SwurJR3l_FXJX05sQdNtgqtc#>L%@amq7HW8s3WccTaObNs~UchXB)=DETUU8p^Y zkcR;$6gigllv=4>>6B=6o~F(Qa>;U9X4)p3TG-jv2=gY)&=c)>IUrDYcu zqEvU=-5gb$YWWCq)f%5J=tI{PoOzD5dOFzp z71{%Tneh4=jYTmepnHd&I!A?G5ilCJR_^-^?f$$vXL;Yd|xj%yvc@#&