Skip to content

Commit 584b8da

Browse files
committed
Simplify minify_html helper. NFC
1 parent da8b92b commit 584b8da

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

tools/link.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import shlex
1212
import shutil
1313
import stat
14-
import time
1514
from subprocess import PIPE
1615
from urllib.parse import quote
1716

@@ -2547,6 +2546,7 @@ def generate_traditional_runtime_html(target, options, js_target, wasm_target):
25472546
write_file(target, shell)
25482547

25492548

2549+
@ToolchainProfiler.profile()
25502550
def minify_html(filename):
25512551
if settings.DEBUG_LEVEL >= 2:
25522552
return
@@ -2585,14 +2585,11 @@ def minify_html(filename):
25852585

25862586
logger.debug(f'minifying HTML file {filename}')
25872587
size_before = os.path.getsize(filename)
2588-
start_time = time.time()
25892588
shared.check_call(shared.get_npm_cmd('html-minifier-terser') + [filename, '-o', filename] + opts, env=shared.env_with_node_in_path())
25902589

25912590
# HTML minifier will turn all null bytes into an escaped two-byte sequence "\0". Turn those back to single byte sequences.
25922591
def unescape_nulls(filename):
2593-
with open(filename, encoding="utf-8") as f:
2594-
data = f.read()
2595-
2592+
data = read_file(filename)
25962593
out = []
25972594
in_escape = False
25982595
i = 0
@@ -2616,15 +2613,13 @@ def unescape_nulls(filename):
26162613
else:
26172614
out.append(ch)
26182615

2619-
with open(filename, "wb") as f:
2620-
f.write(''.join(out).encode("utf-8"))
2616+
write_file(filename, ''.join(out))
26212617

26222618
unescape_nulls(filename)
26232619

2624-
elapsed_time = time.time() - start_time
26252620
size_after = os.path.getsize(filename)
26262621
delta = size_after - size_before
2627-
logger.debug(f'HTML minification took {elapsed_time:.2f} seconds, and shrunk size of {filename} from {size_before} to {size_after} bytes, delta={delta} ({delta * 100.0 / size_before:+.2f}%)')
2622+
logger.debug(f'HTML minification shrunk {filename} from {size_before} to {size_after} bytes, delta={delta} ({delta * 100.0 / size_before:+.2f}%)')
26282623

26292624

26302625
def generate_html(target, options, js_target, target_basename, wasm_target):

0 commit comments

Comments
 (0)