@@ -2377,7 +2377,7 @@ def node_pthread_detection():
23772377def modularize ():
23782378 global final_js
23792379 logger .debug (f'Modularizing, assigning to var { settings .EXPORT_NAME } ' )
2380- src = read_file (final_js )
2380+ generated_js = read_file (final_js )
23812381
23822382 # When targetting node and ES6 we use `await import ..` in the generated code
23832383 # so the outer function needs to be marked as async.
@@ -2390,35 +2390,35 @@ def modularize():
23902390 diagnostics .warning ('emcc' , 'EXPORT_NAME should not be named "config" when targeting Safari' )
23912391
23922392 if settings .MODULARIZE == 'instance' :
2393- src = '''
2393+ wrapper_function = '''
23942394export default async function init(moduleArg = {}) {
23952395 var moduleRtn;
23962396
2397- %(src )s
2397+ %(generated_js )s
23982398
23992399 return await moduleRtn;
24002400}
24012401''' % {
2402- 'src ' : src ,
2402+ 'generated_js ' : generated_js
24032403 }
24042404 else :
2405- src = '''
2405+ wrapper_function = '''
24062406%(maybe_async)sfunction(moduleArg = {}) {
24072407 var moduleRtn;
24082408
2409- %(src )s
2409+ %(generated_js )s
24102410
24112411 return moduleRtn;
24122412}
24132413''' % {
24142414 'maybe_async' : async_emit ,
2415- 'src ' : src ,
2415+ 'generated_js ' : generated_js
24162416 }
24172417
24182418 if settings .MINIMAL_RUNTIME and not settings .PTHREADS :
24192419 # Single threaded MINIMAL_RUNTIME programs do not need access to
24202420 # 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 } ;'
24222422 else :
24232423 script_url_node = ''
24242424 # When MODULARIZE this JS may be executed later,
@@ -2436,24 +2436,24 @@ def modularize():
24362436 src = '''\
24372437 var _scriptName = %(script_url)s;
24382438 %(script_url_node)s
2439- %(src )s
2439+ %(wrapper_function )s
24402440''' % {
24412441 'script_url' : script_url ,
24422442 'script_url_node' : script_url_node ,
2443- 'src ' : src ,
2443+ 'wrapper_function ' : wrapper_function ,
24442444 }
24452445 else :
24462446 src = '''\
24472447 var %(EXPORT_NAME)s = (() => {
24482448 var _scriptName = %(script_url)s;
24492449 %(script_url_node)s
2450- return (%(src )s);
2450+ return (%(wrapper_function )s);
24512451})();
24522452''' % {
24532453 'EXPORT_NAME' : settings .EXPORT_NAME ,
24542454 'script_url' : script_url ,
24552455 'script_url_node' : script_url_node ,
2456- 'src ' : src ,
2456+ 'wrapper_function ' : wrapper_function ,
24572457 }
24582458
24592459 # Given the async nature of how the Module function and Module object
0 commit comments