swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-12-29 00:23:10 +03:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix(es/minifier): Fix evaluator (#3391)

Browse Source
This commit is contained in:
Donny/강동윤 2022-01-28 13:43:29 +09:00 committed by GitHub
parent 3eaebdf479
commit 38c2499358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/swc_ecma_minifier/src/compress/optimize/hoist_props.rs
View File

@ -99,6 +99,7 @@ where
);
self.simple_props
.insert((name.to_id(), s.value.clone()), value);
self.mode.store(name.to_id(), n.init.as_deref().unwrap());
}
PropName::Ident(i) => {
tracing::trace!(
@ -107,6 +108,7 @@ where
);
self.simple_props
.insert((name.to_id(), i.sym.clone()), value);
self.mode.store(name.to_id(), n.init.as_deref().unwrap());
}
_ => {}
}

2
crates/swc_ecma_minifier/src/compress/optimize/inline.rs
View File

@ -200,6 +200,8 @@ where
i.id.span.ctxt
);
self.mode.store(i.to_id(), &*init);
self.lits.insert(i.to_id(), init.clone());
}
return;

91
crates/swc_ecma_minifier/tests/eval.rs
View File

@ -171,38 +171,34 @@ impl VisitMut for PartialInliner {
e.visit_mut_children_with(self);
if let Some(evaluator) = self.eval.as_mut() {
match e {
Expr::TaggedTpl(tt) => {
if tt.tag.is_ident_ref_to("css".into()) {
let res = evaluator.eval_tpl(&tt.tpl);
if let Expr::TaggedTpl(tt) = e {
if tt.tag.is_ident_ref_to("css".into()) {
let res = evaluator.eval_tpl(&tt.tpl);
let res = match res {
Some(v) => v,
None => return,
};
let res = match res {
Some(v) => v,
None => return,
};
match res {
EvalResult::Lit(Lit::Str(s)) => {
let el = TplElement {
span: s.span,
tail: true,
cooked: Some(s.clone()),
raw: s,
};
tt.tpl = Tpl {
span: el.span,
exprs: Default::default(),
quasis: vec![el],
};
}
_ => {
unreachable!()
}
match res {
EvalResult::Lit(Lit::Str(s)) => {
let el = TplElement {
span: s.span,
tail: true,
cooked: Some(s.clone()),
raw: s,
};
tt.tpl = Tpl {
span: el.span,
exprs: Default::default(),
quasis: vec![el],
};
}
_ => {
unreachable!()
}
}
}
_ => {}
}
}
}
@ -466,3 +462,44 @@ fn partial_7() {
",
);
}
#[test]
fn partial_8() {
PartialInliner::expect(
"const darken = c => c
const color = 'red'
const otherColor = 'green'
const mediumScreen = '680px'
const animationDuration = '200ms'
const animationName = 'my-cool-animation'
const obj = { display: 'block' }
export default ({ display }) => (
css`
p.${color} {
color: ${otherColor};
display: ${obj.display};
}
`
)
",
"
const darken = c => c
const color = 'red'
const otherColor = 'green'
const mediumScreen = '680px'
const animationDuration = '200ms'
const animationName = 'my-cool-animation'
const obj = { display: 'block' }
export default ({ display }) => (
css`
p.red {
color: green;
display: block;
}
`
)
",
)
}