alternative way to import require

Author: lkwinta

tools/file_packager.py

@@ -629,15 +629,13 @@ def escape_for_makefile(fpath):
 def generate_js(data_target, data_files, metadata):
   # emcc will add this to the output itself, so it is only needed for
   # standalone calls
-  ret = ''
-  if not options.from_emcc:
+  if options.from_emcc:
+    ret = ''
+  else:
     if options.export_es6:
-      if options.support_node:
-        ret += 'import { createRequire } from \'module\';\n\n'
-      ret += '''export default function loadDataFile(Module) {
-  return new Promise((loadDataResolve, loadDataReject) => {'''
+      ret = 'export default async function loadDataFile(Module) {\n'
     else:
-      ret += '''
+      ret = '''
   var Module = typeof %(EXPORT_NAME)s != 'undefined' ? %(EXPORT_NAME)s : {};\n''' % {"EXPORT_NAME": options.export_name}
 
   ret += '''
@@ -656,18 +654,23 @@ def generate_js(data_target, data_files, metadata):
 
   if options.support_node:
     ret += "    var isNode = typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string';\n"
+
+  if options.support_node and options.export_es6:
+        ret += '''if (isNode) {
+    const { createRequire } = await import('module');
+    /** @suppress{duplicate} */
+    var require = createRequire(import.meta.url);
+  }\n'''
+
+  if options.export_es6:
+    ret += 'return new Promise((loadDataResolve, loadDataReject) => {\n'
   ret += '    function loadPackage(metadata) {\n'
 
   code = '''
       function assert(check, msg) {
         if (!check) throw msg + new Error().stack;
       }\n'''
 
-  if options.support_node and options.export_es6:
-    ret += '''if (isNode) {
-      var require = createRequire(import.meta.url);
-    }'''
-
   # Set up folders
   partial_dirs = []
   for file_ in data_files: