@@ -786,9 +786,9 @@ def generate_js(data_target, data_files, metadata):
786
786
}
787
787
var PACKAGE_NAME = '%s';
788
788
var REMOTE_PACKAGE_BASE = '%s';
789
- var REMOTE_PACKAGE_NAME = Module['locateFile'] ? Module['locateFile'] (REMOTE_PACKAGE_BASE, '') : REMOTE_PACKAGE_BASE;\n ''' % (js_manipulation .escape_for_js_string (data_target ), js_manipulation .escape_for_js_string (remote_package_name ))
789
+ var REMOTE_PACKAGE_NAME = Module['locateFile']?. (REMOTE_PACKAGE_BASE, '') ?? REMOTE_PACKAGE_BASE;\n ''' % (js_manipulation .escape_for_js_string (data_target ), js_manipulation .escape_for_js_string (remote_package_name ))
790
790
metadata ['remote_package_size' ] = remote_package_size
791
- ret += ''' var REMOTE_PACKAGE_SIZE = metadata['remote_package_size'];\n '''
791
+ ret += " var REMOTE_PACKAGE_SIZE = metadata['remote_package_size'];\n "
792
792
793
793
if options .use_preload_cache :
794
794
# Set the id to a hash of the preloaded data, so that caches survive over multiple builds
@@ -1056,8 +1056,8 @@ def generate_js(data_target, data_files, metadata):
1056
1056
# Only tricky bit is the fetch is async, but also when runWithFS is called
1057
1057
# is async, so we handle both orderings.
1058
1058
ret += '''
1059
- var fetchedCallback = null ;
1060
- var fetched = Module['getPreloadedPackage'] ? Module['getPreloadedPackage'] (REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE) : null ;
1059
+ var fetchedCallback;
1060
+ var fetched = Module['getPreloadedPackage']?. (REMOTE_PACKAGE_NAME, REMOTE_PACKAGE_SIZE);
1061
1061
1062
1062
if (!fetched) {
1063
1063
// Note that we don't use await here because we want to execute the
@@ -1108,7 +1108,7 @@ def generate_js(data_target, data_files, metadata):
1108
1108
1109
1109
async function runMetaWithFS() {
1110
1110
Module['addRunDependency']('%(metadata_file)s');
1111
- var metadataUrl = Module['locateFile'] ? Module['locateFile'] ('%(metadata_file)s', '') : '%(metadata_file)s';
1111
+ var metadataUrl = Module['locateFile']?. ('%(metadata_file)s', '') ?? '%(metadata_file)s';
1112
1112
%(node_support_code)s
1113
1113
var response = await fetch(metadataUrl);
1114
1114
if (!response.ok) {
0 commit comments