Unverified Commit bf35b47b authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

Update `swc_core` to `v0.83.28` (#56134)

### What?

 - Use better implementation for `react-remove-properties` and `remove-conosle`.

### Why?


I concluded `react-remove-properties` and `remove-conosle` deserve official plugins, so I promoted them.

 - https://github.com/swc-project/plugins/pull/213
 - https://github.com/swc-project/plugins/pull/215


### How?



 - Closes WEB-1638
 - Closes WEB-1633
 - Closes NEXT-1657
 - Closes #55679

---

# Turbopack changes


* https://github.com/vercel/turbo/pull/6003 
parent af320563
This diff is collapsed.
...@@ -32,18 +32,18 @@ next-transform-dynamic = { path = "packages/next-swc/crates/next-transform-dynam ...@@ -32,18 +32,18 @@ next-transform-dynamic = { path = "packages/next-swc/crates/next-transform-dynam
next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-transform-strip-page-exports" } next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-transform-strip-page-exports" }
# SWC crates # SWC crates
swc_core = { version = "0.83.12", features = [ swc_core = { version = "0.83.28", features = [
"ecma_loader_lru", "ecma_loader_lru",
"ecma_loader_parking_lot", "ecma_loader_parking_lot",
] } ] }
testing = { version = "0.34.1" } testing = { version = "0.34.1" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230929.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230929.3" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230929.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230929.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230929.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230929.3" }
# General Deps # General Deps
......
...@@ -33,6 +33,8 @@ turbopack-binding = { workspace = true, features = [ ...@@ -33,6 +33,8 @@ turbopack-binding = { workspace = true, features = [
"__swc_transform_modularize_imports", "__swc_transform_modularize_imports",
"__swc_transform_relay", "__swc_transform_relay",
] } ] }
react_remove_properties = "0.3.0"
remove_console = "0.4.0"
[dev-dependencies] [dev-dependencies]
turbopack-binding = { workspace = true, features = [ turbopack-binding = { workspace = true, features = [
......
...@@ -63,12 +63,9 @@ pub mod next_ssg; ...@@ -63,12 +63,9 @@ pub mod next_ssg;
pub mod optimize_barrel; pub mod optimize_barrel;
pub mod optimize_server_react; pub mod optimize_server_react;
pub mod page_config; pub mod page_config;
pub mod react_remove_properties;
pub mod react_server_components; pub mod react_server_components;
pub mod remove_console;
pub mod server_actions; pub mod server_actions;
pub mod shake_exports; pub mod shake_exports;
mod top_level_binding_collector;
#[derive(Clone, Debug, Deserialize)] #[derive(Clone, Debug, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
...@@ -251,12 +248,15 @@ where ...@@ -251,12 +248,15 @@ where
relay_plugin, relay_plugin,
match &opts.remove_console { match &opts.remove_console {
Some(config) if config.truthy() => Some(config) if config.truthy() =>
Either::Left(remove_console::remove_console(config.clone())), Either::Left(remove_console::remove_console(
config.clone(),
SyntaxContext::empty().apply_mark(unresolved_mark)
)),
_ => Either::Right(noop()), _ => Either::Right(noop()),
}, },
match &opts.react_remove_properties { match &opts.react_remove_properties {
Some(config) if config.truthy() => Some(config) if config.truthy() =>
Either::Left(react_remove_properties::remove_properties(config.clone())), Either::Left(react_remove_properties::react_remove_properties(config.clone())),
_ => Either::Right(noop()), _ => Either::Right(noop()),
}, },
match &opts.shake_exports { match &opts.shake_exports {
......
use regex::Regex;
use serde::Deserialize;
use turbopack_binding::swc::core::ecma::{
ast::*,
visit::{noop_fold_type, Fold, FoldWith},
};
#[derive(Clone, Debug, Deserialize)]
#[serde(untagged)]
pub enum Config {
All(bool),
WithOptions(Options),
}
impl Config {
pub fn truthy(&self) -> bool {
match self {
Config::All(b) => *b,
Config::WithOptions(_) => true,
}
}
}
#[derive(Clone, Debug, Deserialize)]
pub struct Options {
#[serde(default)]
pub properties: Vec<String>,
}
struct RemoveProperties {
properties: Vec<Regex>,
}
impl RemoveProperties {
fn should_remove_property(&self, name: &str) -> bool {
self.properties.iter().any(|p| p.is_match(name))
}
}
impl Fold for RemoveProperties {
noop_fold_type!();
fn fold_jsx_opening_element(&mut self, mut el: JSXOpeningElement) -> JSXOpeningElement {
el.attrs.retain(|attr| {
!matches!(attr, JSXAttrOrSpread::JSXAttr(JSXAttr {
name: JSXAttrName::Ident(ident),
..
}) if self.should_remove_property(ident.sym.as_ref()))
});
el.fold_children_with(self)
}
}
pub fn remove_properties(config: Config) -> impl Fold {
let mut properties: Vec<Regex> = match config {
Config::WithOptions(x) => x
.properties
.iter()
.map(|pattern| {
Regex::new(pattern).unwrap_or_else(|e| {
panic!("error compiling property regex `{}`: {}", pattern, e);
})
})
.collect(),
_ => vec![],
};
if properties.is_empty() {
// Keep the default regex identical to `babel-plugin-react-remove-properties`.
properties.push(Regex::new(r"^data-test").unwrap());
}
RemoveProperties { properties }
}
use serde::Deserialize;
use turbopack_binding::swc::core::{
common::{collections::AHashSet, DUMMY_SP},
ecma::{
ast::*,
atoms::JsWord,
visit::{noop_fold_type, Fold, FoldWith},
},
};
use crate::top_level_binding_collector::collect_top_level_decls;
#[derive(Clone, Debug, Deserialize)]
#[serde(untagged)]
pub enum Config {
All(bool),
WithOptions(Options),
}
impl Config {
pub fn truthy(&self) -> bool {
match self {
Config::All(b) => *b,
Config::WithOptions(_) => true,
}
}
}
#[derive(Clone, Debug, Deserialize)]
pub struct Options {
#[serde(default)]
pub exclude: Vec<JsWord>,
}
struct RemoveConsole {
exclude: Vec<JsWord>,
bindings: Vec<AHashSet<Id>>,
}
impl RemoveConsole {
fn is_global_console(&self, ident: &Ident) -> bool {
&ident.sym == "console" && !self.bindings.iter().any(|x| x.contains(&ident.to_id()))
}
fn should_remove_call(&mut self, n: &CallExpr) -> bool {
let callee = &n.callee;
let member_expr = match callee {
Callee::Expr(e) => match &**e {
Expr::Member(m) => m,
_ => return false,
},
_ => return false,
};
// Don't attempt to evaluate computed properties.
if matches!(&member_expr.prop, MemberProp::Computed(..)) {
return false;
}
// Only proceed if the object is the global `console` object.
match &*member_expr.obj {
Expr::Ident(i) if self.is_global_console(i) => {}
_ => return false,
}
// Check if the property is requested to be excluded.
// Here we do an O(n) search on the list of excluded properties because the size
// should be small.
match &member_expr.prop {
MemberProp::Ident(i) if !self.exclude.iter().any(|x| *x == i.sym) => {}
_ => return false,
}
true
}
}
impl Fold for RemoveConsole {
noop_fold_type!();
fn fold_stmt(&mut self, stmt: Stmt) -> Stmt {
if let Stmt::Expr(e) = &stmt {
if let Expr::Call(c) = &*e.expr {
if self.should_remove_call(c) {
return Stmt::Empty(EmptyStmt { span: DUMMY_SP });
}
}
}
stmt.fold_children_with(self)
}
fn fold_function(&mut self, mut func: Function) -> Function {
let mut new_params: AHashSet<Id> = AHashSet::default();
for param in &func.params {
new_params.extend(collect_top_level_decls(param));
}
self.bindings.push(new_params);
self.bindings.push(collect_top_level_decls(&func));
func.body = func.body.fold_with(self);
self.bindings.pop().unwrap();
self.bindings.pop().unwrap();
func
}
fn fold_module(&mut self, module: Module) -> Module {
self.bindings.push(collect_top_level_decls(&module));
let m = module.fold_children_with(self);
self.bindings.pop().unwrap();
m
}
fn fold_script(&mut self, script: Script) -> Script {
self.bindings.push(collect_top_level_decls(&script));
let s = script.fold_with(self);
self.bindings.pop().unwrap();
s
}
}
pub fn remove_console(config: Config) -> impl Fold {
let exclude = match config {
Config::WithOptions(x) => x.exclude,
_ => vec![],
};
RemoveConsole {
exclude,
bindings: Default::default(),
}
}
use std::hash::Hash;
use turbopack_binding::swc::core::{
common::{collections::AHashSet, SyntaxContext},
ecma::{
ast::{
ClassDecl, FnDecl, Ident, ImportDefaultSpecifier, ImportNamedSpecifier,
ImportStarAsSpecifier, ModuleItem, ObjectPatProp, Param, Pat, Stmt, VarDeclarator,
},
utils::ident::IdentLike,
visit::{noop_visit_type, Visit, VisitWith},
},
};
// Modified from swc_ecma_utils/src/lib.rs:BindingCollector.
pub struct TopLevelBindingCollector<I>
where
I: IdentLike + Eq + Hash + Send + Sync,
{
only: Option<SyntaxContext>,
bindings: AHashSet<I>,
is_pat_decl: bool,
}
impl<I> TopLevelBindingCollector<I>
where
I: IdentLike + Eq + Hash + Send + Sync,
{
fn add(&mut self, i: &Ident) {
if let Some(only) = self.only {
if only != i.span.ctxt {
return;
}
}
self.bindings.insert(I::from_ident(i));
}
}
impl<I> Visit for TopLevelBindingCollector<I>
where
I: IdentLike + Eq + Hash + Send + Sync,
{
noop_visit_type!();
fn visit_class_decl(&mut self, node: &ClassDecl) {
self.add(&node.ident);
}
fn visit_fn_decl(&mut self, node: &FnDecl) {
self.add(&node.ident);
}
fn visit_pat(&mut self, node: &Pat) {
if self.is_pat_decl {
match node {
Pat::Ident(i) => self.add(&i.id),
Pat::Object(o) => {
for prop in o.props.iter() {
match prop {
ObjectPatProp::Assign(a) => self.add(&a.key),
ObjectPatProp::KeyValue(k) => k.value.visit_with(self),
ObjectPatProp::Rest(_) => {}
}
}
}
Pat::Array(a) => {
for elem in a.elems.iter() {
elem.visit_with(self);
}
}
_ => {}
}
}
}
fn visit_param(&mut self, node: &Param) {
let old = self.is_pat_decl;
self.is_pat_decl = true;
node.visit_children_with(self);
self.is_pat_decl = old;
}
fn visit_import_default_specifier(&mut self, node: &ImportDefaultSpecifier) {
self.add(&node.local);
}
fn visit_import_named_specifier(&mut self, node: &ImportNamedSpecifier) {
self.add(&node.local);
}
fn visit_import_star_as_specifier(&mut self, node: &ImportStarAsSpecifier) {
self.add(&node.local);
}
fn visit_module_items(&mut self, nodes: &[ModuleItem]) {
for node in nodes {
node.visit_children_with(self)
}
}
fn visit_stmts(&mut self, nodes: &[Stmt]) {
for node in nodes {
node.visit_children_with(self)
}
}
fn visit_var_declarator(&mut self, node: &VarDeclarator) {
let old = self.is_pat_decl;
self.is_pat_decl = true;
node.name.visit_with(self);
self.is_pat_decl = false;
node.init.visit_with(self);
self.is_pat_decl = old;
}
}
pub fn collect_top_level_decls<I, N>(n: &N) -> AHashSet<I>
where
I: IdentLike + Eq + Hash + Send + Sync,
N: VisitWith<TopLevelBindingCollector<I>>,
{
let mut v = TopLevelBindingCollector {
only: None,
bindings: Default::default(),
is_pat_decl: false,
};
n.visit_with(&mut v);
v.bindings
}
...@@ -9,9 +9,7 @@ use next_swc::{ ...@@ -9,9 +9,7 @@ use next_swc::{
optimize_barrel::optimize_barrel, optimize_barrel::optimize_barrel,
optimize_server_react::optimize_server_react, optimize_server_react::optimize_server_react,
page_config::page_config_test, page_config::page_config_test,
react_remove_properties::remove_properties,
react_server_components::server_components, react_server_components::server_components,
remove_console::remove_console,
server_actions::{ server_actions::{
server_actions, {self}, server_actions, {self},
}, },
...@@ -232,48 +230,6 @@ fn relay_no_artifact_dir_fixture(input: PathBuf) { ...@@ -232,48 +230,6 @@ fn relay_no_artifact_dir_fixture(input: PathBuf) {
); );
} }
#[fixture("tests/fixture/remove-console/**/input.js")]
fn remove_console_fixture(input: PathBuf) {
let output = input.parent().unwrap().join("output.js");
test_fixture(
syntax(),
&|_tr| remove_console(next_swc::remove_console::Config::All(true)),
&input,
&output,
Default::default(),
);
}
#[fixture("tests/fixture/react-remove-properties/default/**/input.js")]
fn react_remove_properties_default_fixture(input: PathBuf) {
let output = input.parent().unwrap().join("output.js");
test_fixture(
syntax(),
&|_tr| remove_properties(next_swc::react_remove_properties::Config::All(true)),
&input,
&output,
Default::default(),
);
}
#[fixture("tests/fixture/react-remove-properties/custom/**/input.js")]
fn react_remove_properties_custom_fixture(input: PathBuf) {
let output = input.parent().unwrap().join("output.js");
test_fixture(
syntax(),
&|_tr| {
remove_properties(next_swc::react_remove_properties::Config::WithOptions(
next_swc::react_remove_properties::Options {
properties: vec!["^data-custom$".into()],
},
))
},
&input,
&output,
Default::default(),
);
}
#[fixture("tests/fixture/shake-exports/most-usecases/input.js")] #[fixture("tests/fixture/shake-exports/most-usecases/input.js")]
fn shake_exports_fixture(input: PathBuf) { fn shake_exports_fixture(input: PathBuf) {
let output = input.parent().unwrap().join("output.js"); let output = input.parent().unwrap().join("output.js");
......
export default function Home() {
return (
<div data-test-id="1" data-custom="1a">
<div data-custom="2">
<h1 data-testid="3">Hello World!</h1>
</div>
</div>
)
}
export default function Home() {
return <div data-test-id="1">
<div>
<h1 data-testid="3">Hello World!</h1>
</div>
</div>;
}
export default function Home() {
return (
<div data-test-id="1" data-custom="1a">
<div data-custom="2">
<h1 data-testid="3" nested={() => <div data-testid="4">nested</div>}>
Hello World!
</h1>
</div>
</div>
)
}
export default function Home() {
return <div data-custom="1a">
<div data-custom="2">
<h1 nested={()=><div>nested</div>}>
Hello World!
</h1>
</div>
</div>;
}
console.log('remove console test at top level')
export function shouldRemove() {
console.log('remove console test in function')
console.error('remove console test in function / error')
}
export function locallyDefinedConsole() {
let console = {
log: () => {},
}
console.log()
}
export function capturedConsole() {
let console = {
log: () => {},
}
function innerFunc() {
console.log()
}
}
export function overrideInParam(console) {
console.log('')
}
export function overrideInParamObjectPatPropAssign({ console }) {
console.log('')
}
export function overrideInParamObjectPatPropKeyValue({ c: console }) {
console.log('')
}
export function overrideInParamObjectPatPropKeyValueNested({ c: { console } }) {
console.log('')
}
export function overrideInParamArray([console]) {
console.log('')
}
;
export function shouldRemove() {
;
;
}
export function locallyDefinedConsole() {
let console = {
log: ()=>{}
};
console.log();
}
export function capturedConsole() {
let console = {
log: ()=>{}
};
function innerFunc() {
console.log();
}
}
export function overrideInParam(console) {
console.log('');
}
export function overrideInParamObjectPatPropAssign({ console }) {
console.log('');
}
export function overrideInParamObjectPatPropKeyValue({ c: console }) {
console.log('');
}
export function overrideInParamObjectPatPropKeyValueNested({ c: { console } }) {
console.log('');
}
export function overrideInParamArray([console]) {
console.log('');
}
let console = {
log: (msg) => {},
}
function func1() {
console.log('remove console test in function')
}
console.log('remove console test at top level')
let console = {
log: (msg)=>{}
};
function func1() {
console.log('remove console test in function');
}
console.log('remove console test at top level');
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.22.6", "@vercel/nft": "0.22.6",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.3",
"acorn": "8.5.0", "acorn": "8.5.0",
"ajv": "8.11.0", "ajv": "8.11.0",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
......
...@@ -128,11 +128,11 @@ export class TerserPlugin { ...@@ -128,11 +128,11 @@ export class TerserPlugin {
} }
if (debugMinify && debugMinify === '1') { if (debugMinify && debugMinify === '1') {
console.dir( console.log(
{ JSON.stringify({
name, name,
source: source.source().toString(), source: source.source().toString(),
}, }),
{ {
breakLength: Infinity, breakLength: Infinity,
maxStringLength: Infinity, maxStringLength: Infinity,
......
...@@ -1055,8 +1055,8 @@ importers: ...@@ -1055,8 +1055,8 @@ importers:
specifier: 0.22.6 specifier: 0.22.6
version: 0.22.6 version: 0.22.6
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.1 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.3
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.1(react-refresh@0.12.0)(webpack@5.86.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.3(react-refresh@0.12.0)(webpack@5.86.0)'
acorn: acorn:
specifier: 8.5.0 specifier: 8.5.0
version: 8.5.0 version: 8.5.0
...@@ -26991,9 +26991,9 @@ packages: ...@@ -26991,9 +26991,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.1(react-refresh@0.12.0)(webpack@5.86.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.3(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.1} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.3}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.1' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230929.3'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment