Skip to content
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

Jump to bottom

fix(css/prefixer): Reduce the number of vars in debug build #4078

Merged
merged 5 commits into from Mar 18, 2022
Merged

fix(css/prefixer): Reduce the number of vars in debug build #4078

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f381892
Reduce stack usage
kdy1 Mar 18, 2022
ff0e3e1
Reduce more
kdy1 Mar 18, 2022
2dd2c50
Reduce more
kdy1 Mar 18, 2022
ff9b679
Revert & Redo
kdy1 Mar 18, 2022
afa1242
Redo one more
kdy1 Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
96 changes: 75 additions & 21 deletions crates/swc_stylis/src/prefixer.rs
View file
Open in desktop
@@ -1,5 +1,6 @@
use std::mem::take;

use swc_atoms::JsWord;
use swc_common::DUMMY_SP;
use swc_css_ast::*;
use swc_css_utils::{
Expand Down Expand Up @@ -202,6 +203,41 @@ pub enum Prefix {
Ms,
}

impl Prefixer {
fn same_name(&mut self, name: JsWord, n: &Declaration) {
let val = Ident {
span: DUMMY_SP,
value: name.clone(),
raw: name,
};
self.added_declarations.push(Declaration {
span: n.span,
name: n.name.clone(),
value: vec![ComponentValue::Ident(val)],
important: n.important.clone(),
});
}

fn simple(&mut self, val: JsWord, name: JsWord, n: &Declaration) {
let val = ComponentValue::Ident(Ident {
span: DUMMY_SP,
value: val.clone(),
raw: val,
});
let name = DeclarationName::Ident(Ident {
span: DUMMY_SP,
value: name.clone(),
raw: name,
});
self.added_declarations.push(Declaration {
span: n.span,
name,
value: vec![val],
important: n.important.clone(),
});
}
}

impl VisitMut for Prefixer {
fn visit_mut_keyframe_block(&mut self, n: &mut KeyframeBlock) {
let old_in_keyframe_block = self.in_keyframe_block;
Expand Down Expand Up @@ -414,18 +450,13 @@ impl VisitMut for Prefixer {
let ms_new_value = n.value.clone();

macro_rules! same_content {
($prefix:expr,$name:expr) => {{
(Prefix::Webkit, $name:expr) => {{
let name = DeclarationName::Ident(Ident {
span: DUMMY_SP,
value: $name.into(),
raw: $name.into(),
});
let new_value = match $prefix {
Prefix::Webkit => webkit_new_value.clone(),
Prefix::Moz => moz_new_value.clone(),
Prefix::O => o_new_value.clone(),
Prefix::Ms => ms_new_value.clone(),
};
let new_value = webkit_new_value.clone();

self.added_declarations.push(Declaration {
span: n.span,
Expand All @@ -434,45 +465,68 @@ impl VisitMut for Prefixer {
important: n.important.clone(),
});
}};
}

macro_rules! simple {
($name:expr,$val:expr) => {{
let val = ComponentValue::Ident(Ident {
(Prefix::Moz, $name:expr) => {{
let name = DeclarationName::Ident(Ident {
span: DUMMY_SP,
value: $val.into(),
raw: $val.into(),
value: $name.into(),
raw: $name.into(),
});
let new_value = moz_new_value.clone();

self.added_declarations.push(Declaration {
span: n.span,
name,
value: new_value,
important: n.important.clone(),
});
}};

(Prefix::O, $name:expr) => {{
let name = DeclarationName::Ident(Ident {
span: DUMMY_SP,
value: $name.into(),
raw: $name.into(),
});
let new_value = o_new_value.clone();

self.added_declarations.push(Declaration {
span: n.span,
name,
value: vec![val],
value: new_value,
important: n.important.clone(),
});
}};
}

macro_rules! same_name {
($name:expr) => {{
let val = Ident {
(Prefix::Ms, $name:expr) => {{
let name = DeclarationName::Ident(Ident {
span: DUMMY_SP,
value: $name.into(),
raw: $name.into(),
};
});
let new_value = ms_new_value.clone();

self.added_declarations.push(Declaration {
span: n.span,
name: n.name.clone(),
value: vec![ComponentValue::Ident(val)],
name,
value: new_value,
important: n.important.clone(),
});
}};
}

macro_rules! simple {
($name:expr,$val:expr) => {{
self.simple($name.into(), $val.into(), &n);
}};
}

macro_rules! same_name {
($name:expr) => {{
self.same_name($name.into(), &n);
}};
}

match &*name.to_lowercase() {
"appearance" => {
same_content!(Prefix::Webkit, "-webkit-appearance");
Expand Down