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
14 changes: 10 additions & 4 deletions crates/oxc_minifier/src/compressor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ impl<'a> Compressor<'a> {
let max_iterations = options.max_iterations;
let state = MinifierState::new(program.source_type, options);
let mut ctx = ReusableTraverseCtx::new(state, scoping, self.allocator);
let normalize_options =
NormalizeOptions { convert_while_to_fors: true, convert_const_to_let: true };
let normalize_options = NormalizeOptions {
convert_while_to_fors: true,
convert_const_to_let: true,
remove_unnecessary_use_strict: true,
};
Normalize::new(normalize_options).build(program, &mut ctx);
PeepholeOptimizations::new(max_iterations).run_in_loop(program, &mut ctx)
}
Expand All @@ -54,8 +57,11 @@ impl<'a> Compressor<'a> {
let max_iterations = options.max_iterations;
let state = MinifierState::new(program.source_type, options);
let mut ctx = ReusableTraverseCtx::new(state, scoping, self.allocator);
let normalize_options =
NormalizeOptions { convert_while_to_fors: false, convert_const_to_let: false };
let normalize_options = NormalizeOptions {
convert_while_to_fors: false,
convert_const_to_let: false,
remove_unnecessary_use_strict: false,
};
Normalize::new(normalize_options).build(program, &mut ctx);
DeadCodeElimination::new(max_iterations).run_in_loop(program, &mut ctx)
}
Expand Down
7 changes: 5 additions & 2 deletions crates/oxc_minifier/src/peephole/normalize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use crate::{
pub struct NormalizeOptions {
pub convert_while_to_fors: bool,
pub convert_const_to_let: bool,
pub remove_unnecessary_use_strict: bool,
}

/// Normalize AST
Expand Down Expand Up @@ -53,7 +54,7 @@ impl<'a> Normalize {

impl<'a> Traverse<'a, MinifierState<'a>> for Normalize {
fn exit_program(&mut self, node: &mut Program<'a>, _ctx: &mut TraverseCtx<'a>) {
if node.source_type.is_module() {
if self.options.remove_unnecessary_use_strict && node.source_type.is_module() {
node.directives.drain_filter(|d| d.directive.as_str() == "use strict");
}
}
Expand Down Expand Up @@ -118,7 +119,9 @@ impl<'a> Traverse<'a, MinifierState<'a>> for Normalize {
}

fn exit_function_body(&mut self, body: &mut FunctionBody<'a>, ctx: &mut TraverseCtx<'a>) {
Self::remove_unused_use_strict_directive(body, ctx);
if self.options.remove_unnecessary_use_strict {
Self::remove_unused_use_strict_directive(body, ctx);
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions crates/oxc_minifier/tests/peephole/dead_code_elimination.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,3 +404,8 @@ fn drop_labels_with_vars() {

test_with_options("PURE: { var x = 1; foo(x); }", "", options);
}

#[test]
fn keep_use_strict_directives() {
test_same("'use strict'; export function foo() { 'use strict'; return 1; }");
}
Loading