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
7 changes: 7 additions & 0 deletions .changeset/great-rabbits-argue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@devup-ui/rsbuild-plugin": patch
"@devup-ui/webpack-plugin": patch
"@devup-ui/vite-plugin": patch
---

Fix create file issue
2 changes: 1 addition & 1 deletion libs/extractor/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub fn extract(
)
};
let mut css_files = vec![css_file.clone()];
if option.import_main_css {
if option.import_main_css && !option.single_css {
css_files.insert(0, format!("{}/devup-ui.css", option.css_dir));
}
let allocator = Allocator::default();
Expand Down
6 changes: 3 additions & 3 deletions packages/rsbuild-plugin/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export const DevupUI = ({
return code
const {
code: retCode,
css,
css = '',
map,
cssFile,
updatedBaseStyle,
Expand All @@ -155,11 +155,11 @@ export const DevupUI = ({
)
}

if (css) {
if (cssFile) {
if (globalCss.length < css.length) globalCss = css
promises.push(
writeFile(
join(cssDir, basename(cssFile!)),
join(cssDir, basename(cssFile)),
`/* ${resourcePath} ${Date.now()} */`,
'utf-8',
),
Expand Down
4 changes: 2 additions & 2 deletions packages/vite-plugin/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export function DevupUI({

const {
code: retCode,
css,
css = '',
map,
cssFile,
updatedBaseStyle,
Expand All @@ -203,7 +203,7 @@ export function DevupUI({
)
}

if (css) {
if (cssFile) {
const fileNum = getFileNumByFilename(cssFile!)
const prevCss = cssMap.get(fileNum)
if (prevCss && prevCss.length < css.length) cssMap.set(fileNum, css)
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-plugin/src/__tests__/loader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe('devupUILoader', () => {
css: undefined,
free: vi.fn(),
map: undefined,
cssFile: 'cssFile',
cssFile: undefined,
updatedBaseStyle: false,
})
devupUILoader.bind(t as any)(Buffer.from('code'), 'index.tsx')
Expand Down
10 changes: 8 additions & 2 deletions packages/webpack-plugin/src/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,13 @@ const devupUILoader: RawLoaderDefinitionFunction<DevupUILoaderOptions> =
)

if (!rel.startsWith('./')) rel = `./${rel}`
const { code, css, map, cssFile, updatedBaseStyle } = codeExtract(
const {
code,
css = '',
map,
cssFile,
updatedBaseStyle,
} = codeExtract(
id,
source.toString(),
libPackage,
Expand All @@ -58,7 +64,7 @@ const devupUILoader: RawLoaderDefinitionFunction<DevupUILoaderOptions> =
writeFile(join(cssDir, 'devup-ui.css'), getCss(null, false), 'utf-8'),
)
}
if (css) {
if (cssFile) {
const content = `${this.resourcePath} ${Date.now()}`
if (watch && this._compiler)
(this._compiler as any).__DEVUP_CACHE = content
Expand Down