Skip to content

Extract used CSS variables from .css files #17433

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

Merged
RobinMalfait merged 6 commits into from
Mar 28, 2025
Merged

Extract used CSS variables from .css files #17433

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7dc7878
passthrough the extension to the Extractor itself
RobinMalfait Mar 28, 2025
7b2a5c1
_do_ scan `.css` files but only for CSS variable usage
RobinMalfait Mar 28, 2025
7eb4908
Revert "passthrough the extension to the Extractor itself"
RobinMalfait Mar 28, 2025
9f7d0f9
extract used CSS variables from CSS files
RobinMalfait Mar 28, 2025
481793b
update changelog
RobinMalfait Mar 28, 2025
5272925
rename function
RobinMalfait Mar 28, 2025
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
Prev Previous commit
rename function 
It's shorter, and fits on a single line now.
  • Loading branch information
@RobinMalfait
RobinMalfait committed Mar 28, 2025
commit 5272925870747383886b341d61fa8d9914e8fcce
2 changes: 1 addition & 1 deletion crates/oxide/src/extractor/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ impl<'a> Extractor<'a> {
extracted
}

pub fn extract_css_variables_from_css_files(&mut self) -> Vec<Extracted<'a>> {
pub fn extract_variables_from_css(&mut self) -> Vec<Extracted<'a>> {
Copy link
Member

@philipp-spiess philipp-spiess Mar 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be done in a pre-processor where we already have logic to do that based on file extension?

Copy link
Member Author

@RobinMalfait RobinMalfait Mar 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort of but not really, we do have the contents and the extension so we do have all the information we need, but we return a new potentially transformed input file.

pub fn pre_process_input(content: &[u8], extension: &str) -> Vec<u8> { … }

But we don't emit extracted variables here. So we could update this logic to also emit Vec<Extracted>.

Another solution is that we could transform the CSS file and replace everything that is not a used CSS variable with whitespace. That way the normal extractor won't find anything, and the CSS extractor will only find used variables.

But both these solutions seem like a hack, and a bit of an abuse for this pre_process_input function 😅 unless you're thinking about something completely different?

Copy link
Member

@philipp-spiess philipp-spiess Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I think this does make sense, agree that abusing pre-process for this does feel wrong too now that I think about it more.

let mut extracted = Vec::with_capacity(100);

let len = self.cursor.input.len();
Expand Down
3 changes: 1 addition & 2 deletions crates/oxide/src/scanner/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,7 @@ fn extract_css_variables(blobs: Vec<Vec<u8>>) -> Vec<String> {
return None;
}

let extracted =
crate::extractor::Extractor::new(blob).extract_css_variables_from_css_files();
let extracted = crate::extractor::Extractor::new(blob).extract_variables_from_css();
if extracted.is_empty() {
return None;
}
Expand Down