@@ -2377,7 +2377,7 @@ def node_pthread_detection():
2377
2377
def modularize ():
2378
2378
global final_js
2379
2379
logger .debug (f'Modularizing, assigning to var { settings .EXPORT_NAME } ' )
2380
- src = read_file (final_js )
2380
+ generated_js = read_file (final_js )
2381
2381
2382
2382
# When targetting node and ES6 we use `await import ..` in the generated code
2383
2383
# so the outer function needs to be marked as async.
@@ -2386,35 +2386,35 @@ def modularize():
2386
2386
async_emit = 'async '
2387
2387
2388
2388
if settings .MODULARIZE == 'instance' :
2389
- src = '''
2389
+ wrapper_function = '''
2390
2390
export default async function init(moduleArg = {}) {
2391
2391
var moduleRtn;
2392
2392
2393
- %(src )s
2393
+ %(generated_js )s
2394
2394
2395
2395
return await moduleRtn;
2396
2396
}
2397
2397
''' % {
2398
- 'src ' : src ,
2398
+ 'generated_js ' : generated_js
2399
2399
}
2400
2400
else :
2401
- src = '''
2401
+ wrapper_function = '''
2402
2402
%(maybe_async)sfunction(moduleArg = {}) {
2403
2403
var moduleRtn;
2404
2404
2405
- %(src )s
2405
+ %(generated_js )s
2406
2406
2407
2407
return moduleRtn;
2408
2408
}
2409
2409
''' % {
2410
2410
'maybe_async' : async_emit ,
2411
- 'src ' : src ,
2411
+ 'generated_js ' : generated_js
2412
2412
}
2413
2413
2414
2414
if settings .MINIMAL_RUNTIME and not settings .PTHREADS :
2415
2415
# Single threaded MINIMAL_RUNTIME programs do not need access to
2416
2416
# document.currentScript, so a simple export declaration is enough.
2417
- src = '/** @nocollapse */ var %s = %s' % ( settings .EXPORT_NAME , src )
2417
+ src = f '/** @nocollapse */ var { settings .EXPORT_NAME } = { wrapper_function } ;'
2418
2418
else :
2419
2419
script_url_node = ''
2420
2420
# When MODULARIZE this JS may be executed later,
@@ -2432,24 +2432,24 @@ def modularize():
2432
2432
src = '''\
2433
2433
var _scriptName = %(script_url)s;
2434
2434
%(script_url_node)s
2435
- %(src )s
2435
+ %(wrapper_function )s
2436
2436
''' % {
2437
2437
'script_url' : script_url ,
2438
2438
'script_url_node' : script_url_node ,
2439
- 'src ' : src ,
2439
+ 'wrapper_function ' : wrapper_function ,
2440
2440
}
2441
2441
else :
2442
2442
src = '''\
2443
2443
var %(EXPORT_NAME)s = (() => {
2444
2444
var _scriptName = %(script_url)s;
2445
2445
%(script_url_node)s
2446
- return (%(src )s);
2446
+ return (%(wrapper_function )s);
2447
2447
})();
2448
2448
''' % {
2449
2449
'EXPORT_NAME' : settings .EXPORT_NAME ,
2450
2450
'script_url' : script_url ,
2451
2451
'script_url_node' : script_url_node ,
2452
- 'src ' : src ,
2452
+ 'wrapper_function ' : wrapper_function ,
2453
2453
}
2454
2454
2455
2455
# Given the async nature of how the Module function and Module object
0 commit comments