Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,7 @@ impl JavascriptParserPlugin for AMDParserPlugin {
None
}

fn can_rename(
&self,
_parser: &mut JavascriptParser,
_expr: &Expr,
for_name: &str,
) -> Option<bool> {
fn can_rename(&self, _parser: &mut JavascriptParser, for_name: &str) -> Option<bool> {
if for_name == DEFINE {
return Some(true);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,21 +402,9 @@ impl CommonJsImportsParserPlugin {
}

impl JavascriptParserPlugin for CommonJsImportsParserPlugin {
fn can_rename(&self, parser: &mut JavascriptParser, expr: &Expr, for_name: &str) -> Option<bool> {
fn can_rename(&self, parser: &mut JavascriptParser, for_name: &str) -> Option<bool> {
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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ impl DefineParserPlugin {
}

impl JavascriptParserPlugin for DefineParserPlugin {
fn can_rename(&self, parser: &mut JavascriptParser, _expr: &Expr, str: &str) -> Option<bool> {
fn can_rename(&self, parser: &mut JavascriptParser, str: &str) -> Option<bool> {
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
Expand Down
4 changes: 2 additions & 2 deletions crates/rspack_plugin_javascript/src/parser_plugin/drive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -579,9 +579,9 @@ impl JavascriptParserPlugin for JavaScriptParserPluginDrive {
None
}

fn can_rename(&self, parser: &mut JavascriptParser, expr: &Expr, str: &str) -> Option<bool> {
fn can_rename(&self, parser: &mut JavascriptParser, str: &str) -> Option<bool> {
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -62,7 +62,7 @@ impl ProvideParserPlugin {
}

impl JavascriptParserPlugin for ProvideParserPlugin {
fn can_rename(&self, _parser: &mut JavascriptParser, _expr: &Expr, str: &str) -> Option<bool> {
fn can_rename(&self, _parser: &mut JavascriptParser, str: &str) -> Option<bool> {
self.names.contains(str).then_some(true)
}

Expand Down
2 changes: 1 addition & 1 deletion crates/rspack_plugin_javascript/src/parser_plugin/trait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool> {
fn can_rename(&self, _parser: &mut JavascriptParser, _str: &str) -> Option<bool> {
None
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,7 @@ pub struct URLPlugin {
}

impl JavascriptParserPlugin for URLPlugin {
fn can_rename(
&self,
_parser: &mut JavascriptParser,
_expr: &Expr,
for_name: &str,
) -> Option<bool> {
fn can_rename(&self, _parser: &mut JavascriptParser, for_name: &str) -> Option<bool> {
(for_name == "URL").then_some(true)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down

This file was deleted.

Loading