Skip to content

Commit 59f01d8

Browse files
authored
[file_packager] Use null chaining. NFC (#24921)
1 parent 678bcbf commit 59f01d8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/file_packager.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -786,9 +786,9 @@ def generate_js(data_target, data_files, metadata):
786786
}
787787
var PACKAGE_NAME = '%s';
788788
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))
790790
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"
792792

793793
if options.use_preload_cache:
794794
# 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):
10561056
# Only tricky bit is the fetch is async, but also when runWithFS is called
10571057
# is async, so we handle both orderings.
10581058
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);
10611061
10621062
if (!fetched) {
10631063
// 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):
11081108
11091109
async function runMetaWithFS() {
11101110
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';
11121112
%(node_support_code)s
11131113
var response = await fetch(metadataUrl);
11141114
if (!response.ok) {

0 commit comments

Comments
 (0)