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

build(cargo): bump up swc_core* #3012

Merged
merged 4 commits into from
Dec 14, 2022
Merged

build(cargo): bump up swc_core* #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21ed694
build(cargo): bump up swc_core*
kwonoj Dec 14, 2022
e8f6e20
build(cargo): update lockfile
kwonoj Dec 14, 2022
fc49b44
fix(turbopack-css): update swc_core changes
kwonoj Dec 14, 2022
b462cd1
test(turbopack-ecmascript): update test fixtures
kwonoj Dec 14, 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
244 changes: 113 additions & 131 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ opt-level = 3
indexmap = { version = "1.9.2" }
# Keep consistent with preset_env_base through swc_core
browserslist-rs = { version = "0.12.2" }
swc_core = { version = "0.45.4" }
testing = { version = "0.31.14" }
swc_emotion = { version = "0.28.4" }
styled_jsx = { version = "0.29.8" }
styled_components = { version = "0.52.8" }
modularize_imports = { version = "0.25.8" }
mdxjs = { version = "0.1.3" }
swc_core = { version = "0.48.12" }
testing = { version = "0.31.25" }
swc_emotion = { version = "0.28.6" }
styled_jsx = { version = "0.29.10" }
styled_components = { version = "0.52.10" }
modularize_imports = { version = "0.25.10" }
mdxjs = { version = "0.1.4" }
next-dev = { path = "crates/next-dev", version = "0.1.0" }
node-file-trace = { path = "crates/node-file-trace", version = "0.1.0" }
18 changes: 10 additions & 8 deletions crates/turbopack-css/src/references/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl ImportAttributes {
assert_eq!(f.value.len(), 1);
assert!(matches!(&f.value[0], ComponentValue::LayerName(_)));
if let ComponentValue::LayerName(layer_name) = &f.value[0] {
layer_name.clone()
*layer_name.clone()
} else {
unreachable!()
}
Expand All @@ -68,12 +68,12 @@ impl ImportAttributes {

if let Some(supports) = v {
match &supports {
ComponentValue::SupportsCondition(s) => Some(s.clone()),
ComponentValue::SupportsCondition(s) => Some(*s.clone()),
ComponentValue::Declaration(d) => Some(SupportsCondition {
span: DUMMY_SP,
conditions: vec![SupportsConditionType::SupportsInParens(
SupportsInParens::Feature(SupportsFeature::Declaration(
Box::new(d.clone()),
d.clone(),
)),
)],
}),
Expand Down Expand Up @@ -110,10 +110,12 @@ impl ImportAttributes {
// something random that's never gonna be in real css
let mut rule = Rule::ListOfComponentValues(box ListOfComponentValues {
span: DUMMY_SP,
children: vec![ComponentValue::PreservedToken(token(Token::String {
value: Default::default(),
raw: r#""""__turbopack_placeholder__""""#.into(),
}))],
children: vec![ComponentValue::PreservedToken(Box::new(token(
Token::String {
value: Default::default(),
raw: r#""""__turbopack_placeholder__""""#.into(),
},
)))],
});

fn at_rule(name: &str, prelude: AtRulePrelude, inner_rule: Rule) -> Rule {
Expand All @@ -128,7 +130,7 @@ impl ImportAttributes {
block: Some(SimpleBlock {
span: DUMMY_SP,
name: token(Token::LBrace),
value: vec![ComponentValue::Rule(inner_rule)],
value: vec![ComponentValue::from(inner_rule)],
}),
})
}
Expand Down
2 changes: 1 addition & 1 deletion crates/turbopack-ecmascript/tests/analyzer/graph/declarations/graph.snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"dd",
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#1,
),
),
Expand Down
4 changes: 2 additions & 2 deletions crates/turbopack-ecmascript/tests/analyzer/graph/fn-array-2/graph.snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
3,
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#1,
),
),
Expand All @@ -94,7 +94,7 @@
3,
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#1,
),
),
Expand Down
4 changes: 2 additions & 2 deletions crates/turbopack-ecmascript/tests/analyzer/graph/fn-array/graph.snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
3,
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#1,
),
),
Expand All @@ -94,7 +94,7 @@
3,
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#1,
),
),
Expand Down
2 changes: 1 addition & 1 deletion crates/turbopack-ecmascript/tests/analyzer/graph/iife/graph.snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"e",
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#4,
),
),
Expand Down
36 changes: 18 additions & 18 deletions crates/turbopack-ecmascript/tests/analyzer/graph/md5-reduced/graph.snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -101,7 +101,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -174,7 +174,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -250,7 +250,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -344,7 +344,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -417,7 +417,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -490,7 +490,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -563,7 +563,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -657,7 +657,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -733,7 +733,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -806,7 +806,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -879,7 +879,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -967,7 +967,7 @@
[
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -1040,7 +1040,7 @@
[
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -1116,7 +1116,7 @@
[
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -1189,7 +1189,7 @@
[
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -1528,7 +1528,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down Expand Up @@ -1592,7 +1592,7 @@
),
Variable(
(
Atom('d' type=inline),
Atom('d' type=static),
#2,
),
),
Expand Down