Skip to content

Commit 1fd3a6d

Browse files
authored
Merge pull request #543 from dev-five-git/fix-extends-key
Add extends
2 parents 824fd25 + 59f9904 commit 1fd3a6d

21 files changed

Lines changed: 629 additions & 110 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"changes":{"packages/plugin-utils/package.json":"Major"},"note":"Release Plugin utils","date":"2026-01-06T18:10:29.522327400Z"}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"changes":{"packages/next-plugin/package.json":"Patch","packages/rsbuild-plugin/package.json":"Patch","packages/vite-plugin/package.json":"Patch","packages/webpack-plugin/package.json":"Patch","packages/bun-plugin/package.json":"Patch"},"note":"Add extends key","date":"2026-01-06T18:00:01.029206300Z"}

‎bun.lock‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint:fix": "eslint --fix",
1010
"pretest": "bun run --filter @devup-ui/vite-plugin build",
1111
"test": "cargo tarpaulin --out xml --out stdout --out html --all-targets && bun test",
12-
"build": "bun run --filter @devup-ui/wasm build && bun run --filter @devup-ui/react --filter @devup-ui/webpack-plugin build && bun run --filter @devup-ui/eslint-plugin --filter @devup-ui/vite-plugin --filter @devup-ui/next-plugin --filter @devup-ui/rsbuild-plugin --filter @devup-ui/bun-plugin --filter @devup-ui/components --filter @devup-ui/reset-css build",
12+
"build": "bun run --filter @devup-ui/wasm --filter @devup-ui/plugin-utils build && bun run --filter @devup-ui/react --filter @devup-ui/webpack-plugin build && bun run --filter @devup-ui/eslint-plugin --filter @devup-ui/vite-plugin --filter @devup-ui/next-plugin --filter @devup-ui/rsbuild-plugin --filter @devup-ui/bun-plugin --filter @devup-ui/components --filter @devup-ui/reset-css build",
1313
"dev": "bun run --filter '*' dev",
1414
"benchmark": "bun benchmark.js",
1515
"prepare": "husky",

‎packages/bun-plugin/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"dist"
4242
],
4343
"dependencies": {
44+
"@devup-ui/plugin-utils": "workspace:^",
4445
"@devup-ui/wasm": "workspace:^"
4546
},
4647
"devDependencies": {

‎packages/bun-plugin/src/plugin.ts‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { existsSync } from 'node:fs'
2-
import { mkdir, readFile, writeFile } from 'node:fs/promises'
2+
import { mkdir, writeFile } from 'node:fs/promises'
33
import { basename, dirname, join, relative, resolve } from 'node:path'
44

5+
import { loadDevupConfig } from '@devup-ui/plugin-utils'
56
import {
67
codeExtract,
78
getThemeInterface,
@@ -20,13 +21,8 @@ const singleCss = true
2021
async function writeDataFiles() {
2122
let theme = {}
2223
try {
23-
const content = existsSync(devupFile)
24-
? await readFile(devupFile, 'utf-8')
25-
: undefined
26-
27-
if (content) {
28-
theme = JSON.parse(content)?.['theme'] ?? {}
29-
}
24+
const config = await loadDevupConfig(devupFile)
25+
theme = config.theme ?? {}
3026
} catch {
3127
// Error reading devup.json, use empty theme
3228
}

‎packages/next-plugin/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
],
5353
"types": "./dist/index.d.ts",
5454
"dependencies": {
55+
"@devup-ui/plugin-utils": "workspace:^",
5556
"@devup-ui/webpack-plugin": "workspace:^",
5657
"next": "^16.1",
5758
"@devup-ui/wasm": "workspace:^",

‎packages/next-plugin/src/plugin.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
1+
import { existsSync, mkdirSync, writeFileSync } from 'node:fs'
22
import { join, relative, resolve } from 'node:path'
33

4+
import { loadDevupConfigSync } from '@devup-ui/plugin-utils'
45
import {
56
exportClassMap,
67
exportFileMap,
@@ -68,9 +69,9 @@ export function DevupUI(
6869
recursive: true,
6970
})
7071
if (!existsSync(gitignoreFile)) writeFileSync(gitignoreFile, '*')
71-
const theme = existsSync(devupFile)
72-
? JSON.parse(readFileSync(devupFile, 'utf-8'))?.['theme']
73-
: {}
72+
const devupConfig = loadDevupConfigSync(devupFile)
73+
74+
const theme: any = devupConfig.theme ?? {}
7475
registerTheme(theme)
7576
const themeInterface = getThemeInterface(
7677
libPackage,

‎packages/plugin-utils/package.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"name": "@devup-ui/plugin-utils",
3+
"description": "Shared utilities for Devup UI build plugins",
4+
"repository": "https://github.com/dev-five-git/devup-ui",
5+
"author": "devfive",
6+
"license": "Apache-2.0",
7+
"homepage": "https://devup-ui.com",
8+
"bugs": {
9+
"url": "https://github.com/dev-five-git/devup-ui/issues",
10+
"email": "contact@devfive.kr"
11+
},
12+
"keywords": [
13+
"devup-ui",
14+
"plugin",
15+
"utils"
16+
],
17+
"type": "module",
18+
"version": "0.0.1",
19+
"scripts": {
20+
"lint": "eslint",
21+
"build": "tsc && bun build --target node src/index.ts --production --env=disable --outfile dist/index.cjs --format cjs --packages external && bun build --target node src/index.ts --production --env=disable --outfile dist/index.mjs --format esm --packages external"
22+
},
23+
"publishConfig": {
24+
"access": "public"
25+
},
26+
"sideEffects": false,
27+
"main": "./dist/index.cjs",
28+
"module": "./dist/index.mjs",
29+
"types": "./dist/index.d.ts",
30+
"exports": {
31+
".": {
32+
"types": "./dist/index.d.ts",
33+
"import": "./dist/index.mjs",
34+
"require": "./dist/index.cjs"
35+
}
36+
},
37+
"files": [
38+
"dist"
39+
],
40+
"devDependencies": {
41+
"typescript": "^5.9.3"
42+
}
43+
}

0 commit comments

Comments
 (0)