Skip to content

Commit 7be63c1

Browse files
authored
Merge pull request #631 from dev-five-git/owjs3901/landing-vinext-migration
Harden landing e2e gate and migrate to vinext
2 parents 4614ab2 + 90f7a5d commit 7be63c1

110 files changed

Lines changed: 1246 additions & 252 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
run: bun run test:e2e
160160
- name: Build Landing (singleCss)
161161
run: |
162-
rm -rf apps/landing/out apps/landing/.next apps/landing/df
162+
rm -rf apps/landing/dist apps/landing/.next apps/landing/.vinext apps/landing/df
163163
DEVUP_SINGLE_CSS=1 bun run --filter landing build
164164
- name: Run E2E Tests (singleCss)
165165
run: bun run test:e2e
@@ -173,7 +173,7 @@ jobs:
173173
- name: Upload artifact
174174
uses: actions/upload-pages-artifact@v5
175175
with:
176-
path: ./apps/landing/out
176+
path: ./apps/landing/dist/client
177177
retention-days: 1
178178
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
179179
- uses: actions/deploy-pages@v5

‎apps/landing/.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ public/storybook
1616
# testing
1717
/coverage
1818

19-
# next.js
19+
# vinext
2020
/.next/
21-
/out/
21+
/.vinext/
22+
/dist/
2223

2324
# production
2425
/build

‎apps/landing/next.config.ts‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
1-
import { DevupUI } from '@devup-ui/next-plugin'
2-
import createMDX from '@next/mdx'
1+
import { STATIC_EXPORT_DEPLOYMENT_ID } from './src/utils/static-export-rsc-transport'
32

4-
const withMDX = createMDX({
5-
extension: /\.mdx?$/,
6-
})
7-
8-
export default withMDX(
9-
DevupUI(
10-
{
11-
pageExtensions: ['js', 'jsx', 'md', 'mdx', 'ts', 'tsx'],
12-
output: 'export',
13-
reactCompiler: true,
14-
},
15-
{
16-
singleCss: process.env.DEVUP_SINGLE_CSS === '1',
17-
},
18-
),
19-
)
3+
export default {
4+
deploymentId: STATIC_EXPORT_DEPLOYMENT_ID,
5+
output: 'export',
6+
pageExtensions: ['js', 'jsx', 'md', 'mdx', 'ts', 'tsx'],
7+
reactCompiler: true,
8+
}

‎apps/landing/package.json‎

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,43 @@
1-
{
2-
"name": "landing",
3-
"version": "0.1.0",
4-
"type": "module",
5-
"private": true,
6-
"scripts": {
7-
"dev": "node ./script.js && next dev",
8-
"search": "node ./script.js",
9-
"build": "node ./script.js && next build",
10-
"start": "npx serve ./out",
11-
"lint": "eslint"
12-
},
13-
"dependencies": {
14-
"@devup-ui/components": "workspace:^",
15-
"@devup-ui/react": "workspace:^",
16-
"@devup-ui/reset-css": "workspace:^",
17-
"@mdx-js/loader": "^3.1",
18-
"@mdx-js/react": "^3.1",
19-
"@next/mdx": "^16.3",
20-
"body-scroll-lock": "3.1",
21-
"clsx": "^2.1",
22-
"lenis": "1.3",
23-
"next": "^16.3",
24-
"react": "^19.2",
25-
"react-dom": "^19.2",
26-
"react-markdown": "^10.1",
27-
"react-syntax-highlighter": "^16.1"
28-
},
29-
"devDependencies": {
30-
"@devup-ui/next-plugin": "workspace:^",
31-
"@types/body-scroll-lock": "^3.1",
32-
"@types/mdx": "^2.0",
33-
"@types/node": "^26",
34-
"@types/react": "^19",
35-
"@types/react-dom": "^19",
36-
"@types/react-syntax-highlighter": "^15.5",
37-
"babel-plugin-react-compiler": "^1.0",
38-
"typescript": "^7"
39-
}
40-
}
1+
{
2+
"name": "landing",
3+
"version": "0.1.0",
4+
"type": "module",
5+
"private": true,
6+
"scripts": {
7+
"dev": "node ./script.js && vinext dev",
8+
"search": "node ./script.js",
9+
"build": "node ./script.js && vinext build",
10+
"start": "npx serve ./dist/client",
11+
"lint": "eslint"
12+
},
13+
"dependencies": {
14+
"@devup-ui/components": "workspace:^",
15+
"@devup-ui/react": "workspace:^",
16+
"@devup-ui/reset-css": "workspace:^",
17+
"@mdx-js/react": "^3.1",
18+
"body-scroll-lock": "3.1",
19+
"clsx": "^2.1",
20+
"lenis": "1.3",
21+
"react": "^19.2",
22+
"react-dom": "^19.2",
23+
"react-markdown": "^10.1",
24+
"react-server-dom-webpack": "^19.2",
25+
"react-syntax-highlighter": "^16.1",
26+
"vinext": "^1.0.0-beta.8"
27+
},
28+
"devDependencies": {
29+
"@devup-ui/vite-plugin": "workspace:^",
30+
"@mdx-js/rollup": "^3.1",
31+
"@types/body-scroll-lock": "^3.1",
32+
"@types/mdx": "^2.0",
33+
"@types/node": "^26",
34+
"@types/react": "^19",
35+
"@types/react-dom": "^19",
36+
"@types/react-syntax-highlighter": "^15.5",
37+
"@vitejs/plugin-react": "^6.1",
38+
"@vitejs/plugin-rsc": "^0.5.34",
39+
"babel-plugin-react-compiler": "^1.0",
40+
"typescript": "^7",
41+
"vite": "^8.2"
42+
}
43+
}

‎apps/landing/src/LandingTitle.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Text } from '@devup-ui/react'
2+
import type { ReactNode } from 'react'
3+
4+
export function LandingTitle({ children }: { children: ReactNode }) {
5+
return (
6+
<Text as="h1" color="$title" m="0" px={[6, null, 0]} typography="h1">
7+
{children}
8+
</Text>
9+
)
10+
}

‎apps/landing/src/app/(detail)/components/[component]/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default async function Page({
6666
<Text as="strong" color="$primary" m="0" typography="captionBold">
6767
{componentName}
6868
</Text>
69-
<Text as="h4" color="$title" m="0" typography="h4">
69+
<Text as="h1" color="$title" m="0" typography="h4">
7070
{componentName}
7171
</Text>
7272
<Index
@@ -79,7 +79,7 @@ export default async function Page({
7979
}}
8080
/>
8181
<VStack gap="16px" py="30px">
82-
<Text as="h6" color="$title" m="0" typography="h6">
82+
<Text as="h2" color="$title" m="0" typography="h6">
8383
Examples
8484
</Text>
8585
<Flex flexWrap="wrap" gap="16px">

‎apps/landing/src/app/(detail)/components/overview/page.tsx‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Center, css, Flex, Grid, Text, VStack } from '@devup-ui/react'
2+
import type { Metadata } from 'next'
23
import Link from 'next/link'
34

45
import { Icons } from '@/components/icons/components'
@@ -7,23 +8,38 @@ import { COMPONENT_GROUPS } from '@/constants'
78
import Card from '../Card'
89
import Description from './Description.mdx'
910

11+
export const metadata: Metadata = {
12+
title: 'Devup UI Components',
13+
description: 'Explore the component library available in Devup UI.',
14+
alternates: {
15+
canonical: '/components/overview',
16+
},
17+
openGraph: {
18+
title: 'Devup UI Components',
19+
description: 'Explore the component library available in Devup UI.',
20+
url: '/components/overview',
21+
siteName: 'Devup UI',
22+
images: ['/og-image.png'],
23+
},
24+
}
25+
1026
export default function Page() {
1127
return (
1228
<VStack gap="16px">
1329
<Text color="$primary" typography="captionBold">
1430
Overview
1531
</Text>
16-
<Text color="$title" typography="h4">
32+
<Text as="h1" color="$title" m="0" typography="h4">
1733
Devup UI Components
1834
</Text>
1935
<Text color="$text" typography="bodyReg">
2036
<Description />
2137
</Text>
22-
<Text color="$title" pt="30px" typography="h4">
38+
<Text as="h2" color="$title" m="0" pt="30px" typography="h4">
2339
Examples
2440
</Text>
2541
<VStack gap="16px" overflow="visible" pb="30px">
26-
<Text color="$title" typography="h6">
42+
<Text as="h3" color="$title" m="0" typography="h6">
2743
Form
2844
</Text>
2945
<Grid
@@ -82,7 +98,7 @@ export default function Page() {
8298
</Grid>
8399
</VStack>
84100
<VStack gap="16px" overflow="visible" py="30px">
85-
<Text color="$title" typography="h6">
101+
<Text as="h3" color="$title" m="0" typography="h6">
86102
Layout
87103
</Text>
88104
<Grid
@@ -142,7 +158,7 @@ export default function Page() {
142158
</Grid>
143159
</VStack>
144160
<VStack gap="16px" overflow="visible" py="30px">
145-
<Text color="$title" typography="h6">
161+
<Text as="h3" color="$title" m="0" typography="h6">
146162
Theme
147163
</Text>
148164
<Grid

‎apps/landing/src/app/(detail)/docs/api/custom-shorthands/page.mdx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export const metadata = {
1111
'Configure build-time Devup UI prop aliases with generated TypeScript completion.',
1212
url: '/docs/api/custom-shorthands',
1313
siteName: 'Devup UI',
14+
images: ['/og-image.png'],
1415
},
1516
}
1617

‎apps/landing/src/app/(detail)/showcase/page.tsx‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
import { Text, VStack } from '@devup-ui/react'
2+
import type { Metadata } from 'next'
23

34
import { ShowcaseContent } from '@/components/showcase/ShowcaseContent'
45

6+
export const metadata: Metadata = {
7+
title: 'Devup UI Showcase',
8+
description: 'Websites and apps built with Devup UI.',
9+
alternates: {
10+
canonical: '/showcase',
11+
},
12+
openGraph: {
13+
title: 'Devup UI Showcase',
14+
description: 'Websites and apps built with Devup UI.',
15+
url: '/showcase',
16+
siteName: 'Devup UI',
17+
images: ['/og-image.png'],
18+
},
19+
}
20+
521
const SHOWCASE_LIST = [
622
{
723
id: 'devfive',
@@ -101,7 +117,7 @@ export default function Page() {
101117
w="100%"
102118
>
103119
<VStack gap="12px">
104-
<Text color="$title" typography="h4">
120+
<Text as="h1" color="$title" m="0" typography="h4">
105121
Showcase
106122
</Text>
107123
<Text color="$text" typography="bodyReg">

‎apps/landing/src/app/Bench.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export function Bench() {
7676
textAlign={['center', null, 'left']}
7777
wordBreak="keep-all"
7878
>
79-
<Text color="$title" typography="h4">
79+
<Text as="h2" color="$title" m="0" typography="h4">
8080
Comparison Bechmarks
8181
</Text>
8282
<Text color="$text" typography="textL">

0 commit comments

Comments
 (0)