rename to export_es6

Author: lkwinta

ChangeLog.md

@@ -36,6 +36,8 @@ See docs/process.md for more on how version tagging works.
   These are fundamentally incompatible but were previously ignored. (#24849)
 - `--modularize` flag was added to `file_packager.py` available when run 
   standalone, to enable ES6 imports of generated JavaScript code
+- `--export-es6` flag was added to `file_packager.py` available when run 
+  standalone, to enable ES6 imports of generated JavaScript code (#24737)
 
 4.0.12 - 08/01/25
 -----------------

test/test_other.py

@@ -3954,7 +3954,7 @@ def test_file_packager_standalone_modularize(self):
     MESSAGE = 'Remember to build the main file with `-sFORCE_FILESYSTEM` so that it includes support for loading this file package'
 
     create_file('data.txt', 'hello data')
-    err = self.run_process([FILE_PACKAGER, 'test.data', '--modularize', '--preload', 'data.txt', '--js-output=dataFileLoader.js', '--no-node'], stderr=PIPE).stderr
+    err = self.run_process([FILE_PACKAGER, 'test.data', '--export-es6', '--preload', 'data.txt', '--js-output=dataFileLoader.js', '--no-node'], stderr=PIPE).stderr
     self.assertContained(MESSAGE, err)
 
     create_file('test.c', '''
@@ -3980,7 +3980,8 @@ def test_file_packager_standalone_modularize(self):
     var module = loadModule();
     module.then(async (module) => {
       loadDataFile(module);
-      await sleep(1000);
+      // sleep so we don't have to use monitorRunDependencies logic
+      await sleep(2000);
       module._test_fun();
     });
     ''')

tools/file_packager.py

@@ -41,7 +41,7 @@
 
   --export-name=EXPORT_NAME Use custom export name (default is `Module`)
 
-  --modularize Wrap generated code inside ES6 exported function
+  --export-es6 Wrap generated code inside ES6 exported function
 
   --no-force Don't create output if no valid input file is specified.
 
@@ -131,7 +131,7 @@ def __init__(self):
     self.use_preload_plugins = False
     self.support_node = True
     self.wasm64 = False
-    self.modularize = False
+    self.export_es6 = False
 
 
 class DataFile:
@@ -394,8 +394,8 @@ def main():  # noqa: C901, PLR0912, PLR0915
     elif arg == '--no-force':
       options.force = False
       leading = ''
-    elif arg == '--modularize':
-      options.modularize = True
+    elif arg == '--export-es6':
+      options.export_es6 = True
       leading = ''
     elif arg == '--use-preload-cache':
       options.use_preload_cache = True
@@ -491,8 +491,8 @@ def main():  # noqa: C901, PLR0912, PLR0915
     diagnostics.error('TARGET should not be the same value of --js-output')
     return 1
 
-  if options.from_emcc and options.modularize:
-    diagnostics.error('Can\'t use modularize option together with --from-emcc since the code should be embedded '
+  if options.from_emcc and options.export_es6:
+    diagnostics.error('Can\'t use --export-es6 option together with --from-emcc since the code should be embedded '
         'within emcc\'s code')
     return 1
 
@@ -632,7 +632,7 @@ def generate_js(data_target, data_files, metadata):
   if options.from_emcc:
     ret = ''
   else:
-    if options.modularize:
+    if options.export_es6:
       ret = 'export default function loadDataFile(Module) {'
 
     else:
@@ -643,7 +643,7 @@ def generate_js(data_target, data_files, metadata):
   Module['expectedDataFileDownloads'] ??= 0;
   Module['expectedDataFileDownloads']++;'''
 
-  if not options.modularize:
+  if not options.export_es6:
     ret += '''
   (() => {'''
 
@@ -1164,7 +1164,7 @@ def generate_js(data_target, data_files, metadata):
     }
     loadPackage(%s);\n''' % json.dumps(metadata)
 
-  if options.modularize:
+  if options.export_es6:
     ret += '\n};\n// END the loadDataFile function\n'
   else:
     ret += '''