|
15 | 15 | from subprocess import PIPE |
16 | 16 | from typing import Dict, Set |
17 | 17 |
|
18 | | -from . import cache, config, diagnostics, response_file, shared, utils, webassembly |
| 18 | +from . import ( |
| 19 | + cache, |
| 20 | + config, |
| 21 | + diagnostics, |
| 22 | + js_optimizer, |
| 23 | + response_file, |
| 24 | + shared, |
| 25 | + utils, |
| 26 | + webassembly, |
| 27 | +) |
19 | 28 | from .feature_matrix import UNSUPPORTED |
20 | 29 | from .settings import settings |
21 | 30 | from .shared import ( |
@@ -354,8 +363,7 @@ def opt_level_to_str(opt_level, shrink_level=0): |
354 | 363 | return f'-O{min(opt_level, 3)}' |
355 | 364 |
|
356 | 365 |
|
357 | | -def js_optimizer(filename, passes): |
358 | | - from . import js_optimizer |
| 366 | +def run_js_optimizer(filename, passes): |
359 | 367 | try: |
360 | 368 | return js_optimizer.run_on_file(filename, passes) |
361 | 369 | except subprocess.CalledProcessError as e: |
@@ -975,7 +983,7 @@ def wasm2js(js_file, wasm_file, opt_level, use_closure_compiler, debug_info, sym |
975 | 983 | wasm2js_js = wasm2js_js.replace('\n }', '\n}') |
976 | 984 | temp = shared.get_temp_files().get('.js').name |
977 | 985 | utils.write_file(temp, wasm2js_js) |
978 | | - temp = js_optimizer(temp, passes) |
| 986 | + temp = run_js_optimizer(temp, passes) |
979 | 987 | wasm2js_js = utils.read_file(temp) |
980 | 988 | # Closure compiler: in mode 1, we just minify the shell. In mode 2, we |
981 | 989 | # minify the wasm2js output as well, which is ok since it isn't |
|
0 commit comments