Skip to content

fix(theme-generator): missing root content #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RylanBot wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −6
Open

fix(theme-generator): missing root content #860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8beadfa
fix(theme-generator): missing `root` content
RylanBot May 26, 2026
76d2013
Merge branch 'main' into rylan/fix/theme-generator/root
liweijie0812 May 26, 2026
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
21 changes: 15 additions & 6 deletions packages/theme-generator/src/common/utils/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,25 @@ export function downloadFile(blob, fileName) {
export function parseRootCss(cssText) {
if (!cssText) return { rootContent: '', restContent: '' };

const rootBlockMatch = cssText.match(/:root\s*\{([^}]*)\}/);
// 匹配以 :root 开头的选择器组（允许逗号分隔的多个选择器，且包含 :root），后接 { ... } 块
const rootBlockReg = /(?:^|[\s;}])((?:[^{};]*?:root[^{};]*)\s*\{([^}]*)\})/g;

const rootContents = [];
let restContent = cssText;
let match;
while ((match = rootBlockReg.exec(cssText)) !== null) {
rootContents.push(match[2].trim());
restContent = restContent.replace(match[1], '');
}

if (!rootBlockMatch) {
if (rootContents.length === 0) {
return { rootContent: '', restContent: cssText.trim() };
}

const rootContent = rootBlockMatch[1].trim();
const restContent = cssText.replace(rootBlockMatch[0], '').trim();

return { rootContent, restContent };
return {
rootContent: rootContents.join('\n').trim(),
restContent: restContent.trim(),
};
}

/**
Expand Down
Loading