Skip to content

Commit e1be04e

Browse files
committed
Fix split css issue
1 parent c6d2694 commit e1be04e

File tree

12 files changed

+26
-16
lines changed

12 files changed

+26
-16
lines changed

.changeset/chatty-dots-bathe.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@devup-ui/vite-plugin': patch
3+
---
4+
5+
Fix split css issue

apps/vite-lib/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default defineConfig({
2626
isolatedModules: false,
2727
declaration: true,
2828
},
29-
}) as any,
29+
}),
3030
],
3131
build: {
3232
rollupOptions: {

apps/vite/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default defineConfig({
88
react(),
99
DevupUI({
1010
include: ['vite-lib-example'],
11-
// singleCss: true,
11+
singleCss: true,
1212
}),
1313
],
1414
})

packages/components/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default defineConfig({
2929
isolatedModules: false,
3030
declaration: true,
3131
},
32-
}) as any,
32+
}),
3333
],
3434
build: {
3535
rollupOptions: {

packages/eslint-plugin/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default defineConfig({
2828
isolatedModules: false,
2929
declaration: true,
3030
},
31-
}) as any,
31+
}),
3232
],
3333
build: {
3434
rollupOptions: {

packages/next-plugin/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default defineConfig({
2828
isolatedModules: false,
2929
declaration: true,
3030
},
31-
}) as any,
31+
}),
3232
],
3333
build: {
3434
rollupOptions: {

packages/react/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default defineConfig({
2929
isolatedModules: false,
3030
declaration: true,
3131
},
32-
}) as any,
32+
}),
3333
],
3434
build: {
3535
rollupOptions: {

packages/reset-css/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default defineConfig({
2929
isolatedModules: false,
3030
declaration: true,
3131
},
32-
}) as any,
32+
}),
3333
],
3434
build: {
3535
rollupOptions: {

packages/rsbuild-plugin/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default defineConfig({
2828
isolatedModules: false,
2929
declaration: true,
3030
},
31-
}) as any,
31+
}),
3232
],
3333
build: {
3434
rollupOptions: {

packages/vite-plugin/src/plugin.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ export function DevupUI({
120120
output: {
121121
manualChunks(id) {
122122
// merge devup css files
123-
if (id.split('?')[0].endsWith('devup-ui.css')) {
124-
return `devup-ui.css`
123+
const fileName = basename(id).split('?')[0]
124+
if (/devup-ui(-\d+)?\.css$/.test(fileName)) {
125+
return fileName
125126
}
126127
},
127128
},
@@ -149,20 +150,24 @@ export function DevupUI({
149150
}
150151
},
151152
resolveId(id, importer) {
153+
const fileName = basename(id).split('?')[0]
152154
if (
153-
id.includes('devup-ui.css') &&
155+
/devup-ui(-\d+)?\.css$/.test(fileName) &&
154156
resolve(importer ? join(dirname(importer), id) : id) ===
155-
resolve(join(cssDir, 'devup-ui.css'))
157+
resolve(join(cssDir, fileName))
156158
) {
157159
return join(
158160
cssDir,
159-
`devup-ui.css?t=${Date.now().toString() + (cssMap.get(null)?.length ?? 0)}`,
161+
`${fileName}?t=${
162+
Date.now().toString() +
163+
(cssMap.get(getFileNumByFilename(fileName))?.length ?? 0)
164+
}`,
160165
)
161166
}
162167
},
163168
load(id) {
164169
const fileName = basename(id).split('?')[0]
165-
if (fileName.startsWith('devup-ui') && fileName.endsWith('.css')) {
170+
if (/devup-ui(-\d+)?\.css$/.test(fileName)) {
166171
const fileNum = getFileNumByFilename(fileName)
167172
const css = getCss(fileNum, false)
168173
cssMap.set(fileNum, css)

0 commit comments

Comments
 (0)