diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/require_ensure_dependencies_block_parse_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/require_ensure_dependencies_block_parse_plugin.rs index 7368a8f53e69..d0bc411d6613 100644 --- a/crates/rspack_plugin_javascript/src/parser_plugin/require_ensure_dependencies_block_parse_plugin.rs +++ b/crates/rspack_plugin_javascript/src/parser_plugin/require_ensure_dependencies_block_parse_plugin.rs @@ -75,16 +75,12 @@ impl JavascriptParserPlugin for RequireEnsureDependenciesBlockParserPlugin { let chunk_name = match expr .args .get(3) - .or(error_expr.as_ref().and(None)) // !errorExpression - .or(expr.args.get(2)) + .or_else(|| if error_expr.is_some() { None } else { expr.args.get(2) }) // !errorExpression { - Some(arg) => { - let chunk_name_expr = parser.evaluate_expression(&arg.expr); - match chunk_name_expr.as_string() { - Some(chunk_name_expr) => Some(chunk_name_expr), - None => return None, - } - } + Some(arg) => match parser.evaluate_expression(&arg.expr).as_string() { + Some(chunk_name) => Some(chunk_name), + None => return None, + }, None => None, }; diff --git a/tests/rspack-test/configCases/parsing/dead-code-elimination-require-ensure/test.filter.js b/tests/rspack-test/configCases/parsing/dead-code-elimination-require-ensure/test.filter.js deleted file mode 100644 index 21bade41cf13..000000000000 --- a/tests/rspack-test/configCases/parsing/dead-code-elimination-require-ensure/test.filter.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = () => "TODO: require function is used in a way in which dependencies cannot be statically extracted"; \ No newline at end of file diff --git a/tests/rspack-test/configCases/parsing/dead-code-elimination/test.filter.js b/tests/rspack-test/configCases/parsing/dead-code-elimination/test.filter.js index 7779a1356ac1..b81d76c930a9 100644 --- a/tests/rspack-test/configCases/parsing/dead-code-elimination/test.filter.js +++ b/tests/rspack-test/configCases/parsing/dead-code-elimination/test.filter.js @@ -1 +1 @@ -module.exports = () => "FIXME: build failed"; \ No newline at end of file +module.exports = () => "TODO: support parser.scope.terminated" \ No newline at end of file