Skip to content

Commit 2d90afa

Browse files
authored
Merge pull request #328 from dev-five-git/add-layout
Impl layout
2 parents ee34b7c + 8aad3df commit 2d90afa

File tree

72 files changed

+1899
-1204
lines changed

Some content is hidden

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

72 files changed

+1899
-1204
lines changed

.changeset/tiny-rocks-hunt.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
"@devup-ui/rsbuild-plugin": patch
3+
"@devup-ui/webpack-plugin": patch
4+
"@devup-ui/wasm": patch
5+
"@devup-ui/next-plugin": patch
6+
"@devup-ui/vite-plugin": patch
7+
---
8+
9+
Optimized typography CSS values
10+
11+
Merged base component CSS to avoid duplicate generation
12+
13+
Introduced @layer to ensure style order consistency in CSS split mode
14+
15+
Downgraded nm base to avoid issues with g-ad class (display: none when AdBlock is enabled)
16+
17+
Fixed global CSS logic issue in CSS split mode
18+
19+

.changeset/tiny-rocks-hunt2.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@devup-ui/vite-plugin": patch
3+
---
4+
5+
Fixed duplicate main.css generation in CSS split mode on vite
6+
7+
8+
9+

.changeset/tiny-rocks-hunt3.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@devup-ui/webpack-plugin": patch
3+
---
4+
5+
Fixed default theme issue in Webpack
6+
7+
8+
9+
10+
11+

Cargo.lock

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ npm install @devup-ui/next-plugin
4242

4343
# on vite
4444
npm install @devup-ui/vite-plugin
45+
46+
# on rsbuild
47+
npm install @devup-ui/rsbuild-plugin
48+
49+
# on webpack
50+
npm install @devup-ui/webpack-plugin
4551
```
4652

4753
## Features

apps/landing/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"dev": "node ./script.js && next dev",
88
"search": "node ./script.js",
99
"build": "node ./script.js && next build",
10-
"start": "node ./script.js && next start",
10+
"start": "npx serve ./out",
1111
"lint": "eslint"
1212
},
1313
"dependencies": {
1414
"@devup-ui/components": "workspace:*",
1515
"@devup-ui/react": "workspace:*",
1616
"@devup-ui/reset-css": "workspace:*",
17-
"@mdx-js/loader": "^3.1.0",
18-
"@mdx-js/react": "^3.1.0",
17+
"@mdx-js/loader": "^3.1.1",
18+
"@mdx-js/react": "^3.1.1",
1919
"@next/mdx": "^15.5.2",
2020
"@types/mdx": "^2.0.13",
2121
"body-scroll-lock": "3.1.5",

apps/next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"dev": "next dev",
88
"build": "next build",
9-
"start": "next start",
9+
"start": "npx serve ./out",
1010
"lint": "next lint"
1111
},
1212
"dependencies": {

apps/rsbuild/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"build": "rsbuild build",
88
"dev": "rsbuild dev --open",
99
"preview": "rsbuild preview",
10+
"start": "npx serve ./dist",
1011
"lint": "tsc && eslint"
1112
},
1213
"dependencies": {
@@ -15,7 +16,7 @@
1516
"@devup-ui/react": "workspace:*"
1617
},
1718
"devDependencies": {
18-
"@rsbuild/core": "^1.5.1",
19+
"@rsbuild/core": "^1.5.3",
1920
"@rsbuild/plugin-react": "^1.4.0",
2021
"@devup-ui/rsbuild-plugin": "workspace:*"
2122
}

apps/rsbuild/src/App.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
import { Box } from '@devup-ui/react';
1+
import { Box, Flex, Text } from '@devup-ui/react';
22

33
const App = () => {
44
return (
55
<div className="content">
66
<Box bg="blue" _hover={{ bg: 'red' }} color="white">
77
Rsbuild support
88
</Box>
9+
<Flex>
10+
<Text color="#777">a</Text>
11+
<Text color="#777">b</Text>
12+
<Text typography="header">typo</Text>
13+
</Flex>
914
</div>
1015
);
1116
};

apps/vite-lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"vite-plugin-dts": "^4.5.4",
2020
"@devup-ui/vite-plugin": "workspace:*",
2121
"@vitejs/plugin-react": "^5.0.2",
22-
"vite": "^7.1.3",
22+
"vite": "^7.1.4",
2323
"typescript": "^5",
2424
"@types/node": "^24",
2525
"@types/react": "^19"

0 commit comments

Comments
 (0)