Skip to content

Commit d862a45

Browse files
authored
fix: should handle require ensure with error function (#12054)
1 parent 88402f4 commit d862a45

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

crates/rspack_plugin_javascript/src/parser_plugin/require_ensure_dependencies_block_parse_plugin.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,12 @@ impl JavascriptParserPlugin for RequireEnsureDependenciesBlockParserPlugin {
7575
let chunk_name = match expr
7676
.args
7777
.get(3)
78-
.or(error_expr.as_ref().and(None)) // !errorExpression
79-
.or(expr.args.get(2))
78+
.or_else(|| if error_expr.is_some() { None } else { expr.args.get(2) }) // !errorExpression
8079
{
81-
Some(arg) => {
82-
let chunk_name_expr = parser.evaluate_expression(&arg.expr);
83-
match chunk_name_expr.as_string() {
84-
Some(chunk_name_expr) => Some(chunk_name_expr),
85-
None => return None,
86-
}
87-
}
80+
Some(arg) => match parser.evaluate_expression(&arg.expr).as_string() {
81+
Some(chunk_name) => Some(chunk_name),
82+
None => return None,
83+
},
8884
None => None,
8985
};
9086

tests/rspack-test/configCases/parsing/dead-code-elimination-require-ensure/test.filter.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = () => "FIXME: build failed";
1+
module.exports = () => "TODO: support parser.scope.terminated"

0 commit comments

Comments
 (0)