diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/amd/amd_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/amd/amd_plugin.rs index 27ea6b959b5a..fbe83a8ab2c2 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/amd/amd_plugin.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/amd/amd_plugin.rs @@ -184,12 +184,7 @@ impl JavascriptParserPlugin for AMDParserPlugin { None } - fn can_rename( - &self, - _parser: &mut JavascriptParser, - _expr: &Expr, - for_name: &str, - ) -> Option { + fn can_rename(&self, _parser: &mut JavascriptParser, for_name: &str) -> Option { if for_name == DEFINE { return Some(true); } diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/common_js_imports_parse_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/common_js_imports_parse_plugin.rs index e03a48abf5c7..2102bb8ad4f4 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/common_js_imports_parse_plugin.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/common_js_imports_parse_plugin.rs @@ -402,21 +402,9 @@ impl CommonJsImportsParserPlugin { } impl JavascriptParserPlugin for CommonJsImportsParserPlugin { - fn can_rename(&self, parser: &mut JavascriptParser, expr: &Expr, for_name: &str) -> Option { + fn can_rename(&self, parser: &mut JavascriptParser, for_name: &str) -> Option { if for_name == expr_name::REQUIRE { - let require_alias = parser.javascript_options.require_alias.unwrap_or(true); - if !require_alias { - let mut warning = create_traceable_error( - "Critical dependency".into(), - "please enable 'module.parser.javascript.requireAlias' to analyze require alias" - .to_string(), - parser.source.to_owned(), - expr.span().into(), - ); - warning.severity = Severity::Warning; - parser.add_warning(warning.into()); - } - Some(require_alias) + Some(parser.javascript_options.require_alias.unwrap_or(true)) } else { None } diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/define_plugin/parser.rs b/crates/rspack_plugin_javascript/src/parser_plugin/define_plugin/parser.rs index 6ec6ad017eb0..2a330a5cceee 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/define_plugin/parser.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/define_plugin/parser.rs @@ -52,7 +52,7 @@ impl DefineParserPlugin { } impl JavascriptParserPlugin for DefineParserPlugin { - fn can_rename(&self, parser: &mut JavascriptParser, _expr: &Expr, str: &str) -> Option { + fn can_rename(&self, parser: &mut JavascriptParser, str: &str) -> Option { if let Some(first_key) = self.walk_data.can_rename.get(str) { self.add_value_dependency(parser, str); if let Some(first_key) = first_key diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/drive.rs b/crates/rspack_plugin_javascript/src/parser_plugin/drive.rs index 4420badb42c6..2424925e32eb 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/drive.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/drive.rs @@ -579,9 +579,9 @@ impl JavascriptParserPlugin for JavaScriptParserPluginDrive { None } - fn can_rename(&self, parser: &mut JavascriptParser, expr: &Expr, str: &str) -> Option { + fn can_rename(&self, parser: &mut JavascriptParser, str: &str) -> Option { for plugin in &self.plugins { - let res = plugin.can_rename(parser, expr, str); + let res = plugin.can_rename(parser, str); // `SyncBailHook` if res.is_some() { return res; diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/provide_plugin/parser.rs b/crates/rspack_plugin_javascript/src/parser_plugin/provide_plugin/parser.rs index b6c82e5a7551..a65e35304492 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/provide_plugin/parser.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/provide_plugin/parser.rs @@ -4,7 +4,7 @@ use cow_utils::CowUtils; use itertools::Itertools; use rspack_core::DependencyRange; use rustc_hash::FxHashSet as HashSet; -use swc_core::{atoms::Atom, common::Spanned, ecma::ast::Expr}; +use swc_core::{atoms::Atom, common::Spanned}; use super::{super::JavascriptParserPlugin, ProvideValue, VALUE_DEP_PREFIX}; use crate::{dependency::ProvideDependency, visitors::JavascriptParser}; @@ -62,7 +62,7 @@ impl ProvideParserPlugin { } impl JavascriptParserPlugin for ProvideParserPlugin { - fn can_rename(&self, _parser: &mut JavascriptParser, _expr: &Expr, str: &str) -> Option { + fn can_rename(&self, _parser: &mut JavascriptParser, str: &str) -> Option { self.names.contains(str).then_some(true) } diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/trait.rs b/crates/rspack_plugin_javascript/src/parser_plugin/trait.rs index b788569e7a79..e6c281f85db7 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/trait.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/trait.rs @@ -38,7 +38,7 @@ pub trait JavascriptParserPlugin { /// The return value will have no effect. fn top_level_for_of_await_stmt(&self, _parser: &mut JavascriptParser, _stmt: &ForOfStmt) {} - fn can_rename(&self, _parser: &mut JavascriptParser, _expr: &Expr, _str: &str) -> Option { + fn can_rename(&self, _parser: &mut JavascriptParser, _str: &str) -> Option { None } diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/url_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/url_plugin.rs index ee8d932e37dc..70e89ff3c003 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/url_plugin.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/url_plugin.rs @@ -104,12 +104,7 @@ pub struct URLPlugin { } impl JavascriptParserPlugin for URLPlugin { - fn can_rename( - &self, - _parser: &mut JavascriptParser, - _expr: &Expr, - for_name: &str, - ) -> Option { + fn can_rename(&self, _parser: &mut JavascriptParser, for_name: &str) -> Option { (for_name == "URL").then_some(true) } diff --git a/crates/rspack_plugin_javascript/src/visitors/dependency/parser/walk.rs b/crates/rspack_plugin_javascript/src/visitors/dependency/parser/walk.rs index c05c4c472cc3..734f7d8ede8a 100644 --- a/crates/rspack_plugin_javascript/src/visitors/dependency/parser/walk.rs +++ b/crates/rspack_plugin_javascript/src/visitors/dependency/parser/walk.rs @@ -375,7 +375,7 @@ impl JavascriptParser<'_> { { let drive = self.plugin_drive.clone(); if drive - .can_rename(self, init, &renamed_identifier) + .can_rename(self, &renamed_identifier) .unwrap_or_default() { if !drive @@ -930,9 +930,7 @@ impl JavascriptParser<'_> { if let Some(rename_identifier) = parser.get_rename_identifier(expr) && let drive = parser.plugin_drive.clone() && rename_identifier - .call_hooks_name(parser, |this, for_name| { - drive.can_rename(this, expr, for_name) - }) + .call_hooks_name(parser, |this, for_name| drive.can_rename(this, for_name)) .unwrap_or_default() && !rename_identifier .call_hooks_name(parser, |this, for_name| drive.rename(this, expr, for_name)) @@ -1259,9 +1257,7 @@ impl JavascriptParser<'_> { if let Some(rename_identifier) = self.get_rename_identifier(&expr.right) && let drive = self.plugin_drive.clone() && rename_identifier - .call_hooks_name(self, |this, for_name| { - drive.can_rename(this, &expr.right, for_name) - }) + .call_hooks_name(self, |this, for_name| drive.can_rename(this, for_name)) .unwrap_or_default() { if !rename_identifier diff --git a/tests/rspack-test/configCases/parsing/renaming-disabled/warnings.js b/tests/rspack-test/configCases/parsing/renaming-disabled/warnings.js deleted file mode 100644 index 01ec4f489bf9..000000000000 --- a/tests/rspack-test/configCases/parsing/renaming-disabled/warnings.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = [ - [/Critical dependency: please enable 'module.parser.javascript.requireAlias' to analyze require alias/], - [/Critical dependency: please enable 'module.parser.javascript.requireAlias' to analyze require alias/] -] \ No newline at end of file