@@ -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.
@@ -2390,35 +2390,35 @@ def modularize():
2390
2390
diagnostics .warning ('emcc' , 'EXPORT_NAME should not be named "config" when targeting Safari' )
2391
2391
2392
2392
if settings .MODULARIZE == 'instance' :
2393
- src = '''
2393
+ wrapper_function = '''
2394
2394
export default async function init(moduleArg = {}) {
2395
2395
var moduleRtn;
2396
2396
2397
- %(src )s
2397
+ %(generated_js )s
2398
2398
2399
2399
return await moduleRtn;
2400
2400
}
2401
2401
''' % {
2402
- 'src ' : src ,
2402
+ 'generated_js ' : generated_js
2403
2403
}
2404
2404
else :
2405
- src = '''
2405
+ wrapper_function = '''
2406
2406
%(maybe_async)sfunction(moduleArg = {}) {
2407
2407
var moduleRtn;
2408
2408
2409
- %(src )s
2409
+ %(generated_js )s
2410
2410
2411
2411
return moduleRtn;
2412
2412
}
2413
2413
''' % {
2414
2414
'maybe_async' : async_emit ,
2415
- 'src ' : src ,
2415
+ 'generated_js ' : generated_js
2416
2416
}
2417
2417
2418
2418
if settings .MINIMAL_RUNTIME and not settings .PTHREADS :
2419
2419
# Single threaded MINIMAL_RUNTIME programs do not need access to
2420
2420
# document.currentScript, so a simple export declaration is enough.
2421
- src = '/** @nocollapse */ var %s = %s' % ( settings .EXPORT_NAME , src )
2421
+ src = f '/** @nocollapse */ var { settings .EXPORT_NAME } = { wrapper_function } ;'
2422
2422
else :
2423
2423
script_url_node = ''
2424
2424
# When MODULARIZE this JS may be executed later,
@@ -2436,24 +2436,24 @@ def modularize():
2436
2436
src = '''\
2437
2437
var _scriptName = %(script_url)s;
2438
2438
%(script_url_node)s
2439
- %(src )s
2439
+ %(wrapper_function )s
2440
2440
''' % {
2441
2441
'script_url' : script_url ,
2442
2442
'script_url_node' : script_url_node ,
2443
- 'src ' : src ,
2443
+ 'wrapper_function ' : wrapper_function ,
2444
2444
}
2445
2445
else :
2446
2446
src = '''\
2447
2447
var %(EXPORT_NAME)s = (() => {
2448
2448
var _scriptName = %(script_url)s;
2449
2449
%(script_url_node)s
2450
- return (%(src )s);
2450
+ return (%(wrapper_function )s);
2451
2451
})();
2452
2452
''' % {
2453
2453
'EXPORT_NAME' : settings .EXPORT_NAME ,
2454
2454
'script_url' : script_url ,
2455
2455
'script_url_node' : script_url_node ,
2456
- 'src ' : src ,
2456
+ 'wrapper_function ' : wrapper_function ,
2457
2457
}
2458
2458
2459
2459
# Given the async nature of how the Module function and Module object
0 commit comments