Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/true-ghosts-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/vite-plugin": patch
---

Add optimize for lib
4 changes: 4 additions & 0 deletions apps/vite-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"version": "0.1.0",
"type": "module",
"private": true,
"exports": {
"import": "./dist/index.js",
"require": "./dist/index.cjs"
},
"scripts": {
"build": "vite build",
"lint": "tsc && eslint"
Expand Down
3 changes: 2 additions & 1 deletion apps/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"dependencies": {
"react": "^19.0.0",
"react-dom": "^19.0.0",
"@devup-ui/react": "workspace:*"
"@devup-ui/react": "workspace:*",
"vite-lib-example": "workspace:*"
},
"devDependencies": {
"@devup-ui/vite-plugin": "workspace:*",
Expand Down
2 changes: 2 additions & 0 deletions apps/vite/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Box, Text } from '@devup-ui/react'
import { Lib } from 'vite-lib-example'

export default function App() {
return (
Expand All @@ -11,6 +12,7 @@ export default function App() {
color="red"
>
hello
<Lib />
</Box>
<Text typography="header">typo</Text>
</div>
Expand Down
7 changes: 6 additions & 1 deletion apps/vite/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,10 @@ import { defineConfig } from 'vite'

// https://vite.dev/config/
export default defineConfig({
plugins: [react(), DevupUI()],
plugins: [
react(),
DevupUI({
include: ['vite-lib-example'],
}),
],
})
5 changes: 4 additions & 1 deletion packages/vite-plugin/src/__tests__/plugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ describe('devupUIPlugin', () => {
ignored: [`!${devupPath}`],
},
},
optimizeDeps: {
exclude: [],
},
build: {
rollupOptions: {
output: {
Expand Down Expand Up @@ -331,7 +334,7 @@ describe('devupUIPlugin', () => {
'C:/devfive/minions-front/apps/vendor/node_modules/.vite/deps/@devup_product-system.js?v=63f19272',
)
expect(codeExtract).toHaveBeenCalledWith(
'C:/devfive/minions-front/apps/vendor/node_modules/.vite/deps/@devup_product-system.js?v=63f19272',
'C:/devfive/minions-front/apps/vendor/node_modules/.vite/deps/@devup_product-system.js',
'code',
libPackage,
cssFile,
Expand Down
20 changes: 16 additions & 4 deletions packages/vite-plugin/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ export function DevupUI({
'process.env.DEVUP_UI_DEFAULT_THEME':
JSON.stringify(getDefaultTheme()),
},
optimizeDeps: {
exclude: include,
},
}
if (extractCss) {
ret['build'] = {
Expand Down Expand Up @@ -131,18 +134,27 @@ export function DevupUI({
async transform(code, id) {
if (!extractCss) return

const fileName = id.split('?')[0]
if (
include.length
? new RegExp(
`node_modules(?!(.*${include.join('|').replaceAll('/', '[\\/\\\\_]')})([\\/\\\\.]|$))`,
).test(id)
`node_modules(?!(${include
.map((i) => `.*${i}`)
.join('|')
.replaceAll('/', '[\\/\\\\_]')})([\\/\\\\.]|$))`,
).test(fileName)
: id.includes('node_modules')
) {
return
}
if (!/\.(tsx|ts|js|mjs|jsx)$/i.test(id.split('?')[0])) return
if (!/\.(tsx|ts|js|mjs|jsx)$/i.test(fileName)) return

const { code: retCode, css } = codeExtract(id, code, libPackage, cssFile)
const { code: retCode, css } = codeExtract(
fileName,
code,
libPackage,
cssFile,
)

if (css && globalCss.length < css.length) {
globalCss = css
Expand Down
13 changes: 12 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.